From c4c503080e7285bc11bf65f79a96cdd9ae719091 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Fri, 16 Jun 2023 16:47:56 +0200 Subject: [PATCH] Do not use DCPlugin subtree anymore --- OnDemandUpdatePTU.pro | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/OnDemandUpdatePTU.pro b/OnDemandUpdatePTU.pro index 899dbfc..9035465 100644 --- a/OnDemandUpdatePTU.pro +++ b/OnDemandUpdatePTU.pro @@ -3,9 +3,11 @@ QT += core QT += widgets serialport QT += network -TARGET = up_dev_ctrl +TARGET = ATBUpdateDC -CONFIG += c++11 +INCLUDEPATH += plugins + +CONFIG += c++17 # CONFIG -= app_bundle # DEFINES+=LinuxDesktop @@ -18,11 +20,11 @@ QMAKE_CXXFLAGS += -Wno-deprecated-copy # subtree.depends = # QMAKE_EXTRA_UNIX_TARGETS += subtree -! exists(DCPlugin) { - $$system("git subtree add --prefix DCPlugin https://git.mimbach49.de/GerhardHoffmann/DCPlugin.git master --squash") -} else { +# ! exists(DCPlugin) { +# $$system("git subtree add --prefix DCPlugin https://git.mimbach49.de/GerhardHoffmann/DCPlugin.git master --squash") +# } else { # $$system("git subtree pull --prefix DCPlugin https://git.mimbach49.de/GerhardHoffmann/DCPlugin.git master --squash") -} +# } # You can make your code fail to compile if it uses deprecated APIs. # In order to do so, uncomment the following line. @@ -52,20 +54,27 @@ contains( CONFIG, DesktopLinux ) { SOURCES += \ main.cpp \ update.cpp \ - message_handler.cpp + message_handler.cpp \ + worker.cpp \ + worker_thread.cpp HEADERS += \ update.h \ message_handler.h \ - DCPlugin/include/interfaces.h + worker.h \ + worker_thread.h \ + plugins/interfaces.h OTHER_FILES += \ - /opt/app/tools/atbupdate/update_log.csv + /opt/app/tools/atbupdate/update_log.csv \ + main.cpp.bck \ + main.cpp.bck2 \ + main.cpp.bck3 # https://blog.developer.atlassian.com/the-power-of-git-subtree/?_ga=2-71978451-1385799339-1568044055-1068396449-1567112770 # git subtree add --prefix DCPlugin https://git.mimbach49.de/GerhardHoffmann/DCPlugin.git master --squash # git subtree pull --prefix DCPlugin https://git.mimbach49.de/GerhardHoffmann/DCPlugin.git master --squash -include(./DCPlugin/DCPlugin.pri) +# include(./DCPlugin/DCPlugin.pri) # Default rules for deployment. qnx: target.path = /tmp/$${TARGET}/bin