Fix for windows
This commit is contained in:
parent
8f416b3303
commit
e1b977becc
@ -131,6 +131,7 @@ if (WIN32)
|
|||||||
file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/rus.traineddata" DESTINATION "${CMAKE_BINARY_DIR}")
|
file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/rus.traineddata" DESTINATION "${CMAKE_BINARY_DIR}")
|
||||||
file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/eng.traineddata" DESTINATION "${CMAKE_BINARY_DIR}")
|
file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/eng.traineddata" DESTINATION "${CMAKE_BINARY_DIR}")
|
||||||
file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/config.ini" DESTINATION "${CMAKE_BINARY_DIR}")
|
file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/config.ini" DESTINATION "${CMAKE_BINARY_DIR}")
|
||||||
|
file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/no_devices.png" DESTINATION "${CMAKE_BINARY_DIR}")
|
||||||
file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/tools/adb/windows" DESTINATION "${CMAKE_BINARY_DIR}/tools/adb")
|
file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/tools/adb/windows" DESTINATION "${CMAKE_BINARY_DIR}/tools/adb")
|
||||||
|
|
||||||
add_custom_command(TARGET ARC POST_BUILD
|
add_custom_command(TARGET ARC POST_BUILD
|
||||||
@ -157,6 +158,10 @@ if (WIN32)
|
|||||||
"${CMAKE_CURRENT_SOURCE_DIR}/config.ini"
|
"${CMAKE_CURRENT_SOURCE_DIR}/config.ini"
|
||||||
"$<TARGET_FILE_DIR:ARC>/config.ini"
|
"$<TARGET_FILE_DIR:ARC>/config.ini"
|
||||||
|
|
||||||
|
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
||||||
|
"${CMAKE_CURRENT_SOURCE_DIR}/no_devices.png"
|
||||||
|
"$<TARGET_FILE_DIR:ARC>/no_devices.png"
|
||||||
|
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy_directory
|
COMMAND ${CMAKE_COMMAND} -E copy_directory
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/tools/adb/windows"
|
"${CMAKE_CURRENT_SOURCE_DIR}/tools/adb/windows"
|
||||||
"$<TARGET_FILE_DIR:ARC>/tools/adb/windows"
|
"$<TARGET_FILE_DIR:ARC>/tools/adb/windows"
|
||||||
|
|||||||
@ -18,6 +18,7 @@
|
|||||||
#include "dao/DeviceDAO.h"
|
#include "dao/DeviceDAO.h"
|
||||||
#include "dao/SettingsDAO.h"
|
#include "dao/SettingsDAO.h"
|
||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
|
#include <QCoreApplication>
|
||||||
#include "widget/common/FlowLayout.h"
|
#include "widget/common/FlowLayout.h"
|
||||||
|
|
||||||
MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) {
|
MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) {
|
||||||
@ -137,7 +138,7 @@ void MainWindow::createDevicePage() {
|
|||||||
containerLayout->setContentsMargins(0, 0, 0, 0);
|
containerLayout->setContentsMargins(0, 0, 0, 0);
|
||||||
|
|
||||||
m_noDevicesLabel = new QLabel(container);
|
m_noDevicesLabel = new QLabel(container);
|
||||||
m_noDevicesPixmap = QPixmap("no_devices.png");
|
m_noDevicesPixmap = QPixmap(QCoreApplication::applicationDirPath() + "/no_devices.png");
|
||||||
m_noDevicesLabel->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored);
|
m_noDevicesLabel->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored);
|
||||||
m_noDevicesLabel->setAlignment(Qt::AlignCenter);
|
m_noDevicesLabel->setAlignment(Qt::AlignCenter);
|
||||||
containerLayout->addWidget(m_noDevicesLabel);
|
containerLayout->addWidget(m_noDevicesLabel);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user