Compare commits

..

No commits in common. "753954ecd7645f07cb5208ff297ef1178ddfdf62" and "cfca8d2ef485e03155ac30060cc39d22e5ae26d1" have entirely different histories.

6 changed files with 10 additions and 14 deletions

View File

@ -197,12 +197,6 @@ contains( CONFIG, PTU5 ) {
CONFIG += link_pkgconfig CONFIG += link_pkgconfig
lessThan(QT_MAJOR_VERSION, 5): PKGCONFIG += qextserialport lessThan(QT_MAJOR_VERSION, 5): PKGCONFIG += qextserialport
QMAKE_CXXFLAGS += -O2 -std=c++17 # for GCC >= 4.7 QMAKE_CXXFLAGS += -O2 -std=c++17 # for GCC >= 4.7
PTU5BASEPATH = /opt/devel/ptu5
INCLUDEPATH += $$PTU5BASEPATH/qt/libs/devicecontroller/include
LIBS += -L$$PTU5BASEPATH/qt/libs/devicecontroller/library
# QMAKE_CXXFLAGS += -Wno-deprecated-copy # QMAKE_CXXFLAGS += -Wno-deprecated-copy
ARCH = PTU5 ARCH = PTU5
DEFINES+=PTU5 DEFINES+=PTU5
@ -215,8 +209,8 @@ contains( CONFIG, PTU5_YOCTO ) {
ARCH = PTU5 ARCH = PTU5
DEFINES+=PTU5 DEFINES+=PTU5
LIBS += -lCAslave # add qmqtt lib
LIBS += -lCAmaster #LIBS += -lQt5Qmqtt
} }
contains( CONFIG, DesktopLinux ) { contains( CONFIG, DesktopLinux ) {
greaterThan(QT_MAJOR_VERSION, 4): QT += serialport greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
@ -256,7 +250,9 @@ HEADERS += \
process/command.h \ process/command.h \
message_handler.h \ message_handler.h \
worker.h \ worker.h \
commandline_parser.h interfaces.h \
commandline_parser.h \
plugins/interfaces.h
OTHER_FILES += \ OTHER_FILES += \
ATBUpdateTool.ini ATBUpdateTool.ini

View File

@ -9,7 +9,7 @@
#endif #endif
#include "message_handler.h" #include "message_handler.h"
#include <DeviceController/interfaces.h> #include "plugins/interfaces.h"
#include "commandline_parser.h" #include "commandline_parser.h"
#include <unistd.h> #include <unistd.h>

View File

@ -4,7 +4,7 @@
#include "utils.h" #include "utils.h"
#include "progress_event.h" #include "progress_event.h"
#include "update_dc_event.h" #include "update_dc_event.h"
#include <DeviceController/interfaces.h> #include "plugins/interfaces.h"
#include <QDateTime> #include <QDateTime>
#include <QMessageBox> #include <QMessageBox>

View File

@ -18,7 +18,7 @@
#include "unistd.h" #include "unistd.h"
#endif #endif
#include <DeviceController/interfaces.h> #include "plugins/interfaces.h"
#include <QSharedMemory> #include <QSharedMemory>
#include <QScopedPointer> #include <QScopedPointer>

View File

@ -9,7 +9,7 @@
#include <QProcess> #include <QProcess>
#include <QPluginLoader> #include <QPluginLoader>
#include <DeviceController/interfaces.h> #include "plugins/interfaces.h"
#ifdef PTU5 #ifdef PTU5
#define SERIAL_PORT "ttymxc2" #define SERIAL_PORT "ttymxc2"

View File

@ -19,7 +19,7 @@
#include <QScopedPointer> #include <QScopedPointer>
#include "message_handler.h" #include "message_handler.h"
#include <DeviceController/interfaces.h> #include "plugins/interfaces.h"
#include "ismas/ismas_client.h" #include "ismas/ismas_client.h"
#include "progress_event.h" #include "progress_event.h"
#include "mainwindow.h" #include "mainwindow.h"