From 4cc42b2a650ea2340879038f03f31eb1a1f31727 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Thu, 28 Sep 2023 12:11:47 +0200 Subject: [PATCH] Set version to 1.3.6. Removed DCPlugin related stuff. --- OnDemandUpdatePTU.pro | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/OnDemandUpdatePTU.pro b/OnDemandUpdatePTU.pro index 7cf7a7c..3abd890 100644 --- a/OnDemandUpdatePTU.pro +++ b/OnDemandUpdatePTU.pro @@ -15,7 +15,7 @@ DEFINES += QT_DEPRECATED_WARNINGS # In order to do so, uncomment the following line. # You can also select to disable deprecated APIs only up to a certain version of Qt. #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 -VERSION=1.3.5 +VERSION=1.3.6 INCLUDEPATH += plugins @@ -27,27 +27,11 @@ DEFINES+=APP_VERSION=\\\"$$VERSION\\\" QMAKE_CXXFLAGS += -g QMAKE_CXXFLAGS += -Wno-deprecated-copy -# custom target for 'git subtree' -# subtree.target = subtree -# subtree.commands = git subtree add --prefix DCPlugin https://git.mimbach49.de/GerhardHoffmann/DCPlugin.git master --squash -# 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 { - # $$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. -#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 - contains( CONFIG, PTU5 ) { greaterThan(QT_MAJOR_VERSION, 4): QT += serialport CONFIG += link_pkgconfig lessThan(QT_MAJOR_VERSION, 5): PKGCONFIG += qextserialport - QMAKE_CXXFLAGS += -std=c++17 # for GCC >= 4.7 + QMAKE_CXXFLAGS += -O2 -std=c++17 # for GCC >= 4.7 QMAKE_CXXFLAGS += -Wno-deprecated-copy ARCH = PTU5 DEFINES+=PTU5 @@ -107,18 +91,6 @@ HEADERS += \ FORMS += \ mainwindow.ui -OTHER_FILES += \ - /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) - - ########################################################################################## # for running program on target through QtCreator