From b8bd251e15c3d17dd05c6a51810d762cb57c06c9 Mon Sep 17 00:00:00 2001 From: jared Date: Wed, 18 Dec 2019 12:03:32 +0800 Subject: [PATCH 01/12] update for build error --- src/TaoQuickApp/App.rc | Bin 2676 -> 2748 bytes src/TaoQuickApp/Src/TaoView.cpp | 2 +- src/TaoQuickApp/Ver.h | 2 +- src/TaoVersion.pri | 7 ++++++- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/TaoQuickApp/App.rc b/src/TaoQuickApp/App.rc index e719a9f075867fb03c8b3290434e5164b6fb0a3f..d303934fd90910839bccb2abad7a712e70d4af40 100644 GIT binary patch delta 52 vcmew&vPX0S7t`cdj8dFV451933_c7llR26C(L@57@troPER%yOImG3{dq08d5-WdHyG diff --git a/src/TaoQuickApp/Src/TaoView.cpp b/src/TaoQuickApp/Src/TaoView.cpp index 18ea22e..26386e6 100644 --- a/src/TaoQuickApp/Src/TaoView.cpp +++ b/src/TaoQuickApp/Src/TaoView.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/TaoQuickApp/Ver.h b/src/TaoQuickApp/Ver.h index 7a27582..1a11405 100644 --- a/src/TaoQuickApp/Ver.h +++ b/src/TaoQuickApp/Ver.h @@ -8,7 +8,7 @@ #define RELEASE_VER_MAIN TaoMAJ #define RELEASE_VER_MAIN2 TaoMIN #define RELEASE_VER_SUB TaoPAT - +#define RELEASE_VER_BUILD REVISION #define VER_COMPANYNAME_STR "JaredTao\0" #define VER_FILEDESCRIPTION_STR "TaoQuickDemo,未经授权不得商用,侵权必究\0" diff --git a/src/TaoVersion.pri b/src/TaoVersion.pri index e9a4ebf..a7785fb 100644 --- a/src/TaoVersion.pri +++ b/src/TaoVersion.pri @@ -3,7 +3,12 @@ TAO_VERSION_TAG = 1.0 # current commit hash REVISION=$$system("git rev-parse HEAD") REVISION=$$str_member($${REVISION}, 0, $$num_add(10, -1)) - +isEmpty(REVISION) { + REVISION = 0000000000 +} +isEmpty(Ver) { + Ver=0.0.0 +} # last tag Ver=$$system("git describe --abbrev=0 --tags") VerList =$$split(Ver, .) From 535f652bed3114cbbcde58490e57359b3c2e393d Mon Sep 17 00:00:00 2001 From: jared Date: Wed, 18 Dec 2019 12:07:19 +0800 Subject: [PATCH 02/12] update version --- src/TaoQuickApp/Ver.h | 2 +- src/TaoVersion.pri | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/TaoQuickApp/Ver.h b/src/TaoQuickApp/Ver.h index 1a11405..d9aa35a 100644 --- a/src/TaoQuickApp/Ver.h +++ b/src/TaoQuickApp/Ver.h @@ -8,7 +8,7 @@ #define RELEASE_VER_MAIN TaoMAJ #define RELEASE_VER_MAIN2 TaoMIN #define RELEASE_VER_SUB TaoPAT -#define RELEASE_VER_BUILD REVISION +#define RELEASE_VER_BUILD TaoREVISIONNUMBER #define VER_COMPANYNAME_STR "JaredTao\0" #define VER_FILEDESCRIPTION_STR "TaoQuickDemo,未经授权不得商用,侵权必究\0" diff --git a/src/TaoVersion.pri b/src/TaoVersion.pri index a7785fb..9dfb5a2 100644 --- a/src/TaoVersion.pri +++ b/src/TaoVersion.pri @@ -1,3 +1,5 @@ +isEmpty(TaoVersionInclude) { +TaoVersionInclude=1 TAO_VERSION_TAG = 1.0 # current commit hash @@ -22,6 +24,7 @@ equals(TEMPLATE, lib) { VER_PAT = $${PAT} VERSION = $${Ver} } +DEFINES += TaoREVISIONNUMBER=$${REVISION} DEFINES += TaoREVISION=\"\\\"$${REVISION}\\\"\" DEFINES += TaoVer=\"\\\"$${Ver}\\\"\" DEFINES += TaoMAJ=$${MAJ} @@ -30,3 +33,4 @@ DEFINES += TaoPAT=$${PAT} DEFINES += TaoDATETIME=\"\\\"$${_DATE_}\\\"\" DEFINES += TaoCompilerVendor=\"\\\"$${QT_VERSION} $${QMAKE_PLATFORM} $${QMAKE_COMPILER} $${QMAKE_TARGET.arch}\\\"\" # message($${DEFINES}) +} From 128bdb1e5e00ff93621237f22983adc8ac5f7371 Mon Sep 17 00:00:00 2001 From: jared Date: Wed, 18 Dec 2019 12:12:40 +0800 Subject: [PATCH 03/12] lock App.rc --- TaoQuick.pro | 3 ++- src/TaoQuickApp/App.rc | Bin 2748 -> 2744 bytes 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/TaoQuick.pro b/TaoQuick.pro index a6cc8e1..977b1d2 100644 --- a/TaoQuick.pro +++ b/TaoQuick.pro @@ -5,4 +5,5 @@ SUBDIRS += \ OTHER_FILES += README.md \ Install.md \ .clang-format \ - LICENSE + LICENSE \ + .github/workflows/* diff --git a/src/TaoQuickApp/App.rc b/src/TaoQuickApp/App.rc index d303934fd90910839bccb2abad7a712e70d4af40..c96090dfde2792089e8b4b481c7187fb014f6415 100644 GIT binary patch delta 16 XcmdlZx Date: Wed, 18 Dec 2019 12:55:33 +0800 Subject: [PATCH 04/12] update for revision --- src/TaoEffectPlugin/Qml/ContentPage/Effect/RingPage.qml | 2 +- src/TaoEffectPlugin/Src/EffectsPlugin.cpp | 2 +- src/TaoQuick/Src/taoquick_plugin.cpp | 4 ++-- src/TaoQuickApp/Src/ITaoQuickPlugin.h | 2 +- src/TaoQuickApp/Src/TaoView.cpp | 2 +- src/TaoQuickApp/Src/TaoView.h | 2 +- src/TaoQuickApp/TaoQuickApp.pro | 9 ++++----- src/TaoQuickApp/Ver.h | 2 +- src/TaoVersion.pri | 9 +++++---- src/src.pro | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/TaoEffectPlugin/Qml/ContentPage/Effect/RingPage.qml b/src/TaoEffectPlugin/Qml/ContentPage/Effect/RingPage.qml index 1f994f1..b8071ba 100644 --- a/src/TaoEffectPlugin/Qml/ContentPage/Effect/RingPage.qml +++ b/src/TaoEffectPlugin/Qml/ContentPage/Effect/RingPage.qml @@ -1,4 +1,4 @@ -import QtQuick 2.12 +import QtQuick 2.12 import QtQuick.Controls 2.12 import "./Effects" TRingPage { diff --git a/src/TaoEffectPlugin/Src/EffectsPlugin.cpp b/src/TaoEffectPlugin/Src/EffectsPlugin.cpp index c75a977..8f5cca3 100644 --- a/src/TaoEffectPlugin/Src/EffectsPlugin.cpp +++ b/src/TaoEffectPlugin/Src/EffectsPlugin.cpp @@ -1,4 +1,4 @@ -#include "EffectsPlugin.h" +#include "EffectsPlugin.h" #include EffectsPlugin::EffectsPlugin(QObject *parent) : QObject (parent) { diff --git a/src/TaoQuick/Src/taoquick_plugin.cpp b/src/TaoQuick/Src/taoquick_plugin.cpp index 4ac11b0..35c7c5b 100644 --- a/src/TaoQuick/Src/taoquick_plugin.cpp +++ b/src/TaoQuick/Src/taoquick_plugin.cpp @@ -1,4 +1,4 @@ -#include "taoquick_plugin.h" +#include "taoquick_plugin.h" #include void TaoQuickPlugin::registerTypes(const char *uri) @@ -7,7 +7,7 @@ void TaoQuickPlugin::registerTypes(const char *uri) Q_INIT_RESOURCE(Qml); qInfo() << "\033[35m" << "Your application is using TaoQuick "; qInfo() << " Version:" << TaoVer; - qInfo() << " Revision:" << TaoREVISION; + qInfo() << " Revision:" << TaoREVISIONSTR; qInfo() << " Author: Jared Tao"; qInfo() << " You can find more info about TaoQuick in website:" << "\033[0m" diff --git a/src/TaoQuickApp/Src/ITaoQuickPlugin.h b/src/TaoQuickApp/Src/ITaoQuickPlugin.h index 1deff5f..151717e 100644 --- a/src/TaoQuickApp/Src/ITaoQuickPlugin.h +++ b/src/TaoQuickApp/Src/ITaoQuickPlugin.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include #include //ITaoQuickPlugin 插件接口 diff --git a/src/TaoQuickApp/Src/TaoView.cpp b/src/TaoQuickApp/Src/TaoView.cpp index 26386e6..0681c89 100644 --- a/src/TaoQuickApp/Src/TaoView.cpp +++ b/src/TaoQuickApp/Src/TaoView.cpp @@ -118,7 +118,7 @@ void TaoView::initAppInfo() pInfo->setProperty("appVersion", TaoVer); pInfo->setProperty("latestVersion", TaoVer); pInfo->setProperty("buildDateTime", TaoDATETIME); - pInfo->setProperty("buildRevision", TaoREVISION); + pInfo->setProperty("buildRevision", TaoREVISIONSTR); pInfo->setProperty("copyRight", VER_LEGALCOPYRIGHT_STR); pInfo->setProperty("descript", QString::fromLocal8Bit(VER_FILEDESCRIPTION_STR)); pInfo->setProperty("compilerVendor", TaoCompilerVendor); diff --git a/src/TaoQuickApp/Src/TaoView.h b/src/TaoQuickApp/Src/TaoView.h index ca22af7..bfc8d91 100644 --- a/src/TaoQuickApp/Src/TaoView.h +++ b/src/TaoQuickApp/Src/TaoView.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "ITaoQuickPlugin.h" diff --git a/src/TaoQuickApp/TaoQuickApp.pro b/src/TaoQuickApp/TaoQuickApp.pro index 86e8162..d38bf0b 100644 --- a/src/TaoQuickApp/TaoQuickApp.pro +++ b/src/TaoQuickApp/TaoQuickApp.pro @@ -6,11 +6,6 @@ CONFIG += plugin c++14 qtquickcompiler include(../TaoVersion.pri) #include(../TaoBundle.pri) -#msvc{ -# QMAKE_CFLAGS += -source-charset:utf-8 -# QMAKE_CXXFLAGS += -source-charset:utf-8 -#} - #一部分头文件加入编译预处理，提高编译速度 msvc { CONFIG += precompile_header @@ -20,6 +15,10 @@ msvc { } } +msvc{ + QMAKE_CFLAGS += -source-charset:utf-8 + QMAKE_CXXFLAGS += -source-charset:utf-8 +} win32 { RC_FILE = App.rc } diff --git a/src/TaoQuickApp/Ver.h b/src/TaoQuickApp/Ver.h index d9aa35a..7c28197 100644 --- a/src/TaoQuickApp/Ver.h +++ b/src/TaoQuickApp/Ver.h @@ -8,7 +8,7 @@ #define RELEASE_VER_MAIN TaoMAJ #define RELEASE_VER_MAIN2 TaoMIN #define RELEASE_VER_SUB TaoPAT -#define RELEASE_VER_BUILD TaoREVISIONNUMBER +#define RELEASE_VER_BUILD TaoREVISION #define VER_COMPANYNAME_STR "JaredTao\0" #define VER_FILEDESCRIPTION_STR "TaoQuickDemo,未经授权不得商用,侵权必究\0" diff --git a/src/TaoVersion.pri b/src/TaoVersion.pri index 9dfb5a2..3e1eee6 100644 --- a/src/TaoVersion.pri +++ b/src/TaoVersion.pri @@ -8,11 +8,12 @@ REVISION=$$str_member($${REVISION}, 0, $$num_add(10, -1)) isEmpty(REVISION) { REVISION = 0000000000 } + +# last tag +Ver=$$system("git describe --abbrev=0 --tags") isEmpty(Ver) { Ver=0.0.0 } -# last tag -Ver=$$system("git describe --abbrev=0 --tags") VerList =$$split(Ver, .) MAJ = $$take_first(VerList) MIN = $$take_first(VerList) @@ -24,8 +25,8 @@ equals(TEMPLATE, lib) { VER_PAT = $${PAT} VERSION = $${Ver} } -DEFINES += TaoREVISIONNUMBER=$${REVISION} -DEFINES += TaoREVISION=\"\\\"$${REVISION}\\\"\" +DEFINES += TaoREVISION=$${REVISION} +DEFINES += TaoREVISIONSTR=\"\\\"$${REVISION}\\\"\" DEFINES += TaoVer=\"\\\"$${Ver}\\\"\" DEFINES += TaoMAJ=$${MAJ} DEFINES += TaoMIN=$${MIN} diff --git a/src/src.pro b/src/src.pro index 7ea5fae..c365396 100644 --- a/src/src.pro +++ b/src/src.pro @@ -5,4 +5,4 @@ SUBDIRS += \ TaoQuickPlugin \ TaoEffectPlugin -CONFIG += ordered \ No newline at end of file +CONFIG += ordered From 31678c6ccfc36ce5547e77a7896be9b40bdf6c71 Mon Sep 17 00:00:00 2001 From: jared Date: Wed, 18 Dec 2019 13:26:44 +0800 Subject: [PATCH 05/12] update ver --- src/TaoQuickApp/App.rc | Bin 2744 -> 2672 bytes src/TaoQuickApp/Src/TaoView.cpp | 2 +- src/TaoQuickApp/Ver.h | Bin 964 -> 1938 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TaoQuickApp/App.rc b/src/TaoQuickApp/App.rc index c96090dfde2792089e8b4b481c7187fb014f6415..276a6c87ffb72a354fc30830437f6d43ebe817f9 100644 GIT binary patch delta 20 ccmdlX`axs^7t>@troPER%yOImG3{ap08XX{SpWb4 delta 56 xcmew$vO{zO7Zan-WJOL%PA7&?22Tbb2A9d4O#K*Qfz0xgA24xj-p90w9RO{B4PpQQ diff --git a/src/TaoQuickApp/Src/TaoView.cpp b/src/TaoQuickApp/Src/TaoView.cpp index 0681c89..b553630 100644 --- a/src/TaoQuickApp/Src/TaoView.cpp +++ b/src/TaoQuickApp/Src/TaoView.cpp @@ -1,4 +1,4 @@ -#include "TaoView.h" +#include "TaoView.h" #include "Logger/Logger.h" #include "Ver.h" diff --git a/src/TaoQuickApp/Ver.h b/src/TaoQuickApp/Ver.h index 7c28197850c320f0157c4a38072f3d73e574ee9d..effad52f54c3a5b9cdf8a91f3c19d728b684d992 100644 GIT binary patch literal 1938 zcmb7_-%c7)5XQgjCceXFy}?Fp;ZB=gP*iG*U|}&aX|h2S;yK+*nnYuQLr<@3G(1 zu4;_3TD)T&@outSWCVJ_6X>P3d7p6p+S$BeHr5q3%=#<#itfai^>aptJ+uAzoFSO! zeFq#72m+AAO1^CFvE0f(8$@@Z4Pxm!|Ayn7y+9M^yUXkhbYp&JNBA1di*gcaUk4AU zlCKoiKm+18MB8}3TG+1VI>vSx4|T8xMBf3ot-M=8uhd3q%7)oog!KeROKrWGLUHKS z$YW^_%$7Mx&ctL;UZ&8yD(YT&qk&HE57-bBFScbg2ME%Y;U?aYYRmC=^I%gc2m-%WhAXRQ`sch)~w+6gU=keUejUH*2-@v!`T-$Om;7VST5NFQ$i literal 964 zcmaJ=!EVz)5WVLsM$RRcnl$mPsW@!yC2VnQv))vygk(AO)-lv}WjlzR5r|961;hpJ zz#W8yRDPyOeuG`NZX8_LgIC^p@6DUp+4gznhp`W7a>84!cEC@ggagGUMlSY_FoglY z?k@C)Fy)00FL;(mX|fN4A!PiF`#G=98f*hG44x-9&l4gGvAS{G4T61 Date: Wed, 18 Dec 2019 13:40:48 +0800 Subject: [PATCH 06/12] fix u8 problem --- src/TaoQuickApp/TaoQuickApp.pri | 7 ++++++- src/TaoQuickApp/Ver-u8.h | 28 ++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 src/TaoQuickApp/Ver-u8.h diff --git a/src/TaoQuickApp/TaoQuickApp.pri b/src/TaoQuickApp/TaoQuickApp.pri index 3ba36a6..8a53e98 100644 --- a/src/TaoQuickApp/TaoQuickApp.pri +++ b/src/TaoQuickApp/TaoQuickApp.pri @@ -3,7 +3,12 @@ HEADERS += \ $$PWD/Src/Logger/Logger.h \ $$PWD/Src/Logger/LoggerTemplate.h \ $$PWD/Src/TaoView.h \ - $$PWD/Ver.h + +msvc { + HEADERS += $$PWD/Ver.h +} else { + HEADERS += $$PWD/Ver-u8.h +} SOURCES += \ $$PWD/Src/Logger/Logger.cpp \ $$PWD/Src/TaoView.cpp \ diff --git a/src/TaoQuickApp/Ver-u8.h b/src/TaoQuickApp/Ver-u8.h new file mode 100644 index 0000000..38cc52d --- /dev/null +++ b/src/TaoQuickApp/Ver-u8.h @@ -0,0 +1,28 @@ +#pragma once + +#define RELEASE_VER 1 // 0: beta version; 1: release version +#define RELEASE_DATE __DATE__ //yyyy-mm-dd; only used for RELEASE_VER=1 + +#define RELEASE_TIME __TIME__ //hh:mm:ss + +#define RELEASE_VER_MAIN TaoMAJ +#define RELEASE_VER_MAIN2 TaoMIN +#define RELEASE_VER_SUB TaoPAT + +#define FILE_VER_STR TaoREVISIONSTR + +#define VER_COMPANYNAME_STR "JaredTao\0" + +#define VER_FILEDESCRIPTION_STR "TaoQuickDemo,未经授权不得商用,侵权必究\0" +#define VER_INTERNALNAME_STR "jaredtao.github.io\0" +#define VER_LEGALCOPYRIGHT_STR "Copyright(C)2019-2029 JaredTao\0" +#define VER_LEGALTRADEMARKS_STR "JaredTao\0" +#define VER_ORIGINALFILENAME_STR "TaoQuickDemo.exe\0" +#define VER_PRODUCTNAME_STR "TaoQuickDemo\0" + +// version number (string) +#define TOSTRING2(arg) #arg + +#define TOSTRING(arg) TOSTRING2(arg) +#define RELEASE_VER_STR TOSTRING(RELEASE_VER_MAIN) "." TOSTRING(RELEASE_VER_MAIN2) "." TOSTRING(RELEASE_VER_SUB) + From 96ef3e798411acdf071acaf2dd402cd9457481ae Mon Sep 17 00:00:00 2001 From: jared Date: Wed, 18 Dec 2019 13:41:14 +0800 Subject: [PATCH 07/12] fix u8 problem --- src/TaoQuickApp/TaoQuickApp.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TaoQuickApp/TaoQuickApp.pri b/src/TaoQuickApp/TaoQuickApp.pri index 8a53e98..0547488 100644 --- a/src/TaoQuickApp/TaoQuickApp.pri +++ b/src/TaoQuickApp/TaoQuickApp.pri @@ -2,7 +2,7 @@ HEADERS += \ $$PWD/Src/ITaoQuickPlugin.h \ $$PWD/Src/Logger/Logger.h \ $$PWD/Src/Logger/LoggerTemplate.h \ - $$PWD/Src/TaoView.h \ + $$PWD/Src/TaoView.h msvc { HEADERS += $$PWD/Ver.h From a56d2f24856c1d2df2aeb1b1d48151bc3e4e5845 Mon Sep 17 00:00:00 2001 From: jared Date: Wed, 18 Dec 2019 13:52:51 +0800 Subject: [PATCH 08/12] update pro selector --- src/TaoQuickApp/TaoQuickApp.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TaoQuickApp/TaoQuickApp.pri b/src/TaoQuickApp/TaoQuickApp.pri index 0547488..8a6a623 100644 --- a/src/TaoQuickApp/TaoQuickApp.pri +++ b/src/TaoQuickApp/TaoQuickApp.pri @@ -4,7 +4,7 @@ HEADERS += \ $$PWD/Src/Logger/LoggerTemplate.h \ $$PWD/Src/TaoView.h -msvc { +win32:msvc { HEADERS += $$PWD/Ver.h } else { HEADERS += $$PWD/Ver-u8.h From 9a466094aac9adf2e840631c8d361e906ccf8991 Mon Sep 17 00:00:00 2001 From: jared Date: Wed, 18 Dec 2019 13:56:00 +0800 Subject: [PATCH 09/12] update selector --- src/TaoQuickApp/TaoQuickApp.pri | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/TaoQuickApp/TaoQuickApp.pri b/src/TaoQuickApp/TaoQuickApp.pri index 8a6a623..80fc6fd 100644 --- a/src/TaoQuickApp/TaoQuickApp.pri +++ b/src/TaoQuickApp/TaoQuickApp.pri @@ -4,9 +4,10 @@ HEADERS += \ $$PWD/Src/Logger/LoggerTemplate.h \ $$PWD/Src/TaoView.h -win32:msvc { +msvc { HEADERS += $$PWD/Ver.h -} else { +} +!msvc { HEADERS += $$PWD/Ver-u8.h } SOURCES += \ From b31ed09a948dca54b2d4b48811ab9d453bb892f2 Mon Sep 17 00:00:00 2001 From: jared Date: Wed, 18 Dec 2019 14:03:49 +0800 Subject: [PATCH 10/12] update version file --- src/TaoQuickApp/App.rc | Bin 2672 -> 2580 bytes src/TaoQuickApp/Src/TaoView.cpp | 6 +++++- src/TaoQuickApp/TaoQuickApp.pri | 14 ++++++++------ src/TaoQuickApp/{Ver.h => Ver-u16.h} | Bin 4 files changed, 13 insertions(+), 7 deletions(-) rename src/TaoQuickApp/{Ver.h => Ver-u16.h} (100%) diff --git a/src/TaoQuickApp/App.rc b/src/TaoQuickApp/App.rc index 276a6c87ffb72a354fc30830437f6d43ebe817f9..489189c2236d077598042241a44a909c38b8dae0 100644 GIT binary patch delta 443 zcmew$GDT#946iOjDT5({8G{}}27}T>W!;HETHIU=$_%LtISj=NsS^WbC$8Y(hlu1c zq%dSMq%m+!JXy}jHQANX5=b6o7M?tfv1Bq2Q_ti>%tDjpn7JlDVB(m(k4bCtD<&DJ z3OQyaUM>bCgTeabn0Z7E7%CVH7<`~|P%FT)^O%)@CTf99ox~y`%*CJpg-#5v4DJk` z41SX*vItLJ!@@T?fJJWdBo-lVxC{dqP|g}CCc}zR4=APCzLs2v=qM&60tva(4Gi44UIsSF@-I|g0`E(T>FF9$3JRG=ve z6Ut*qVaQ}i11sU3c(|MuB*8n`n$Z% zaA9y|aAF8$aEBNJR3|%GfLTHqY!<5BAUSCT1_Oo)AohW~4DO7{narj@o8~fW1IgoH z@*}e-ke$dPJh_I2Z?YPT9E8X31hmzi!IQxcYHK2kHCRTL6D~g4kkxSV2NoxwxFKsZ zn6#YyhSdnnGMwzk<_2U5vRh9+$L0cNLDU#dKEfUbRkMeKZ*l~O37qEuWF@jlPd4CW xgN6{uWvD!mJ0mzHz$%5YxKnzv0~_DuZJZ!?Ky^#O!b$-cq9EuB^p^|RX8=BPS%Clm diff --git a/src/TaoQuickApp/Src/TaoView.cpp b/src/TaoQuickApp/Src/TaoView.cpp index b553630..7b777eb 100644 --- a/src/TaoQuickApp/Src/TaoView.cpp +++ b/src/TaoQuickApp/Src/TaoView.cpp @@ -1,6 +1,10 @@ #include "TaoView.h" #include "Logger/Logger.h" -#include "Ver.h" +#ifdef VER_Utf16 +#include "Ver-u16.h" +#else +#include "Ver-u8.h" +#endif #include #include diff --git a/src/TaoQuickApp/TaoQuickApp.pri b/src/TaoQuickApp/TaoQuickApp.pri index 80fc6fd..baa8310 100644 --- a/src/TaoQuickApp/TaoQuickApp.pri +++ b/src/TaoQuickApp/TaoQuickApp.pri @@ -1,15 +1,17 @@ +msvc { + HEADERS += $$PWD/Ver-u16.h + DEFINES += VER_Utf16 +} else { + HEADERS += $$PWD/Ver-u8.h +} + HEADERS += \ $$PWD/Src/ITaoQuickPlugin.h \ $$PWD/Src/Logger/Logger.h \ $$PWD/Src/Logger/LoggerTemplate.h \ $$PWD/Src/TaoView.h -msvc { - HEADERS += $$PWD/Ver.h -} -!msvc { - HEADERS += $$PWD/Ver-u8.h -} + SOURCES += \ $$PWD/Src/Logger/Logger.cpp \ $$PWD/Src/TaoView.cpp \ diff --git a/src/TaoQuickApp/Ver.h b/src/TaoQuickApp/Ver-u16.h similarity index 100% rename from src/TaoQuickApp/Ver.h rename to src/TaoQuickApp/Ver-u16.h From 7ad627176a6364c462ef4aee19c98ea295c892a0 Mon Sep 17 00:00:00 2001 From: jared Date: Thu, 2 Jan 2020 10:11:07 +0800 Subject: [PATCH 11/12] add gitee mirror[skip ci] --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index bcce8e5..edd1e4d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ [English](README-en.md) +[gitee镜像:https://gitee.com/jaredtao/TaoQuick](https://gitee.com/jaredtao/TaoQuick) ------------------------------------------------------------- # 目录 From 387f0b953ede7a9b4f612697999b8d858bd32313 Mon Sep 17 00:00:00 2001 From: jared Date: Thu, 9 Jan 2020 17:26:41 +0800 Subject: [PATCH 12/12] mingw not use rc --- src/TaoQuickApp/TaoQuickApp.pro | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/TaoQuickApp/TaoQuickApp.pro b/src/TaoQuickApp/TaoQuickApp.pro index d38bf0b..6d4e6ef 100644 --- a/src/TaoQuickApp/TaoQuickApp.pro +++ b/src/TaoQuickApp/TaoQuickApp.pro @@ -19,19 +19,19 @@ msvc{ QMAKE_CFLAGS += -source-charset:utf-8 QMAKE_CXXFLAGS += -source-charset:utf-8 } -win32 { +win32:!mingw { RC_FILE = App.rc } macos { ICON = milk.icns } -CONFIG(debug,debug|release){ +CONFIG(debug,debug|release) { DESTDIR = $$absolute_path($${_PRO_FILE_PWD_}/../../bin/debug/) } else { DESTDIR = $$absolute_path($${_PRO_FILE_PWD_}/../../bin/release/) } -CONFIG(debug,debug|release){ +CONFIG(debug,debug|release) { MOC_DIR = build/debug/moc RCC_DIR = build/debug/rcc UI_DIR = build/debug/ui