From c7f152026e00fdef8b2c4ce94b50dcc971f96a4d Mon Sep 17 00:00:00 2001 From: jared Date: Fri, 19 Jun 2020 11:18:43 +0800 Subject: [PATCH] update prf --- .qmake.conf | 2 +- TaoQuick.pro | 1 - mkspecs/features/taoVersion.prf | 14 +++++--- src/TaoEffectPlugin/TaoEffectPlugin.pro | 36 ++++++++----------- src/TaoQuick/Src/taoquick_plugin.h | 4 +++ src/TaoQuick/TaoQuick.pri | 26 ++++++++++++-- src/TaoQuick/TaoQuick.pro | 45 ++++-------------------- src/TaoQuickApp/TaoQuickApp.pri | 24 ++++++++----- src/TaoQuickApp/TaoQuickApp.pro | 41 ++++++++------------- src/TaoQuickApp/Ver-u16.h | Bin 1938 -> 1910 bytes src/TaoQuickApp/Ver-u8.h | 2 +- src/TaoQuickPlugin/TaoQuickPlugin.pro | 37 +++++++------------ 12 files changed, 104 insertions(+), 128 deletions(-) diff --git a/.qmake.conf b/.qmake.conf index 962ce5d..f5be993 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -4,4 +4,4 @@ TaoQuick_BUILD_TREE = $$PWD/build TaoQuick_RUN_TREE = $$PWD/bin -TaoQuick_VERSION_MAJOR = 1.0 +TaoQuick_VERSION_MAJOR = 0.3 diff --git a/TaoQuick.pro b/TaoQuick.pro index af888b5..1177ba9 100644 --- a/TaoQuick.pro +++ b/TaoQuick.pro @@ -3,7 +3,6 @@ lessThan(QT_MAJOR_VERSION, 5) { } else: lessThan(QT_MINOR_VERSION, 12){ error("current Qt version $$QT_VERSION, this project need grather than 5.12.0") } -load(taoVersion) TEMPLATE = subdirs diff --git a/mkspecs/features/taoVersion.prf b/mkspecs/features/taoVersion.prf index 6257ec7..88d5b27 100644 --- a/mkspecs/features/taoVersion.prf +++ b/mkspecs/features/taoVersion.prf @@ -19,14 +19,18 @@ MAJ = $$take_first(VerList) MIN = $$take_first(VerList) PAT = $$take_first(VerList) - VER_MAJ = $${MAJ} - VER_MIN = $${MIN} - VER_PAT = $${PAT} - VERSION = $${Ver} +# VER_MAJ = $${MAJ} +# VER_MIN = $${MIN} +# VER_PAT = $${PAT} +# VERSION = $${Ver} DEFINES += TaoREVISION=$${REVISION} DEFINES += TaoREVISIONSTR=\"\\\"$${REVISION}\\\"\" + DEFINES += TaoVer=\"\\\"$${Ver}\\\"\" + DEFINES += TaoMAJ=$${MAJ} + DEFINES += TaoMIN=$${MIN} + DEFINES += TaoPAT=$${PAT} DEFINES += TaoDATETIME=\"\\\"$${_DATE_}\\\"\" DEFINES += TaoCompilerVendor=\"\\\"$${QT_VERSION} $${QMAKE_PLATFORM} $${QMAKE_COMPILER} $${QMAKE_TARGET.arch}\\\"\" - # message($${DEFINES}) +# message($${DEFINES}) } diff --git a/src/TaoEffectPlugin/TaoEffectPlugin.pro b/src/TaoEffectPlugin/TaoEffectPlugin.pro index ab4ae80..c3a2b3c 100644 --- a/src/TaoEffectPlugin/TaoEffectPlugin.pro +++ b/src/TaoEffectPlugin/TaoEffectPlugin.pro @@ -10,7 +10,20 @@ msvc { } load(taoVersion) include(../TaoPlugin.pri) -include(../TaoBundle.pri) + + +load(taoBundle) +BundlePath = $$getBundlePath("TaoQuickApp") + +load(taoBuildPath) +setBuildPath($${TaoQuick_BUILD_TREE}/$${TARGET}) + +CONFIG(debug, debug|release){ + DESTDIR=$${TaoQuick_RUN_TREE}/debug/$${BundlePath}TaoPlugin +} else { + DESTDIR=$${TaoQuick_RUN_TREE}/release/$${BundlePath}TaoPlugin +} + SOURCES += \ Src/EffectsPlugin.cpp @@ -20,23 +33,4 @@ HEADERS += \ RESOURCES += \ Qml.qrc -CONFIG(debug, debug|release){ - tgt=$$absolute_path($${_PRO_FILE_PWD_}/../../bin/debug/$${BundlePath}TaoPlugin) -} else { - tgt=$$absolute_path($${_PRO_FILE_PWD_}/../../bin/release/$${BundlePath}TaoPlugin) -} -win32 { - tgt ~= s,/,\\\\,g -} -DESTDIR = $${tgt} -CONFIG(debug,debug|release){ - MOC_DIR = build/debug/moc - RCC_DIR = build/debug/rcc - UI_DIR = build/debug/ui - OBJECTS_DIR = build/debug/obj -} else { - MOC_DIR = build/release/moc - RCC_DIR = build/release/rcc - UI_DIR = build/release/ui - OBJECTS_DIR = build/release/obj -} + diff --git a/src/TaoQuick/Src/taoquick_plugin.h b/src/TaoQuick/Src/taoquick_plugin.h index 88b3576..3a14ec5 100644 --- a/src/TaoQuick/Src/taoquick_plugin.h +++ b/src/TaoQuick/Src/taoquick_plugin.h @@ -14,6 +14,7 @@ public: void initializeEngine(QQmlEngine* engine, const char* uri) override { Q_INIT_RESOURCE(Qml); + qInfo() << "\033[35m" << "Your application is using TaoQuick "; qInfo() << " Version:" << TaoVer; @@ -27,6 +28,7 @@ public: qInfo() << "\033[0m\033[32m" << "Good luck to you." << "\033[0m"; + QQmlEngineExtensionPlugin::initializeEngine(engine, uri); } }; @@ -40,7 +42,9 @@ class TaoQuickPlugin : public QQmlExtensionPlugin { public: void registerTypes(const char*) override { + Q_INIT_RESOURCE(Qml); + qInfo() << "\033[35m" << "Your application is using TaoQuick "; qInfo() << " Version:" << TaoVer; diff --git a/src/TaoQuick/TaoQuick.pri b/src/TaoQuick/TaoQuick.pri index dcd0d91..4faab37 100644 --- a/src/TaoQuick/TaoQuick.pri +++ b/src/TaoQuick/TaoQuick.pri @@ -1,3 +1,9 @@ +QT += qml quick + +CONFIG += plugin c++11 qtquickcompiler + +CONFIG += file_copies + HEADERS += \ $$PWD/Src/taoquick_plugin.h @@ -7,7 +13,23 @@ RESOURCES += \ $$PWD/Qml.qrc # Additional import path used to resolve QML modules in Qt Creator's code model -QML2_IMPORT_PATH += $$_PRO_FILE_PWD_/Qml +QML2_IMPORT_PATH += $$PWD/TaoQuick # Additional import path used to resolve QML modules just for Qt Quick Designer -QML_DESIGNER_IMPORT_PATH += $$_PRO_FILE_PWD_/Qml \ No newline at end of file +QML_DESIGNER_IMPORT_PATH += $$PWD/TaoQuick +!android { + qmldirFile = $$PWD/qmldir + + #copy_qmldir for general run + copy_qmldir.files = $${qmldirFile} + copy_qmldir.path = $$DESTDIR + COPIES += copy_qmldir + + #install_qmldir for install + installPath = $$[QT_INSTALL_QML]/$${uri} + install_qmldir.files = $${qmldirFile} + install_qmldir.path = $${installPath} + INSTALLS += install_qmldir + target.path = $$installPath + INSTALLS += target +} diff --git a/src/TaoQuick/TaoQuick.pro b/src/TaoQuick/TaoQuick.pro index 7e7c4cc..ae15ad2 100644 --- a/src/TaoQuick/TaoQuick.pro +++ b/src/TaoQuick/TaoQuick.pro @@ -2,10 +2,6 @@ TEMPLATE = lib TARGET = TaoQuick -QT += qml quick - -CONFIG += plugin c++11 qtquickcompiler -CONFIG += file_copies versionAtLeast(QT_VERSION, 5.15.0) { # 5.15 use new feature: qmltypes,QML_IMPORT_NAME @@ -15,47 +11,20 @@ versionAtLeast(QT_VERSION, 5.15.0) { } uri = $$TARGET -#load(taoVersion) +load(taoVersion) + load(taoBundle) -load(taoBuildPath) BundlePath = $$getBundlePath("TaoQuickApp") -#include(../TaoBundle.pri) -include(TaoQuick.pri) -include(TaoQuick/TaoQuickDesigner.pri) + +load(taoBuildPath) +setBuildPath($${TaoQuick_BUILD_TREE}/$${TARGET}) CONFIG(debug, debug|release){ DESTDIR = $${TaoQuick_RUN_TREE}/debug/$${BundlePath}$${uri} } else { DESTDIR = $${TaoQuick_RUN_TREE}/release/$${BundlePath}$${uri} } -setBuildPath($${TaoQuick_BUILD_TREE}/$${TARGET}) -#copy_qmldir -!android { -# copy_qmldir.target = $$DESTDIR/qmldir -# copy_qmldir.depends = $$_PRO_FILE_PWD_/qmldir -# win32 { -# copy_qmldir.target ~= s,/,\\\\,g -# copy_qmldir.depends ~= s,/,\\\\,g -# } -# copy_qmldir.commands = $${QMAKE_COPY_FILE} $${copy_qmldir.depends} $${copy_qmldir.target} -# QMAKE_EXTRA_TARGETS += copy_qmldir -# PRE_TARGETDEPS += $$copy_qmldir.target - copy_qmldir.files = $$_PRO_FILE_PWD_/qmldir - copy_qmldir.path = $$DESTDIR - COPIES += copy_qmldir -} +include(TaoQuick.pri) +include(TaoQuick/TaoQuickDesigner.pri) -#install_qmldir -!android { - installPath = $$[QT_INSTALL_QML]/$${uri} -# win32 { -# installPath ~= s,/,\\,g -# } - install_qmldir.files = $$_PRO_FILE_PWD_/qmldir - install_qmldir.path = $$installPath - INSTALLS += install_qmldir - - target.path = $$installPath - INSTALLS += target -} diff --git a/src/TaoQuickApp/TaoQuickApp.pri b/src/TaoQuickApp/TaoQuickApp.pri index b3c5ef5..280ae0d 100644 --- a/src/TaoQuickApp/TaoQuickApp.pri +++ b/src/TaoQuickApp/TaoQuickApp.pri @@ -1,8 +1,16 @@ - QT += qml quick + CONFIG += plugin c++14 qtquickcompiler + CONFIG += file_copies +#msvc { +# HEADERS += $$PWD/Ver-u16.h +# DEFINES += VER_Utf16 +#} else { +# HEADERS += $$PWD/Ver-u8.h +#} + msvc{ QMAKE_CFLAGS += -source-charset:utf-8 QMAKE_CXXFLAGS += -source-charset:utf-8 @@ -10,18 +18,12 @@ msvc{ #一部分头文件加入编译预处理，提高编译速度 msvc { CONFIG += precompile_header - PRECOMPILED_HEADER = Src/stdafx.h + PRECOMPILED_HEADER = $$PWD/Src/stdafx.h precompile_header:!isEmpty(PRECOMPILED_HEADER) { DEFINES += USING_PCH } } -#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 \ @@ -42,3 +44,9 @@ SOURCES += \ RESOURCES += \ $$PWD/Qml.qrc \ $$PWD/Image.qrc + +!android { + trans.files = $$files($$_PRO_FILE_PWD_/Trans/language_*.json) + trans.path = $$DESTDIR/Trans + COPIES += trans +} diff --git a/src/TaoQuickApp/TaoQuickApp.pro b/src/TaoQuickApp/TaoQuickApp.pro index ef3114b..0a21244 100644 --- a/src/TaoQuickApp/TaoQuickApp.pro +++ b/src/TaoQuickApp/TaoQuickApp.pro @@ -1,9 +1,21 @@ TEMPLATE = app TARGET = TaoQuickApp -#load(taoVersion) -#include(../TaoBundle.pri) +load(taoVersion) +load(taoBundle) +BundlePath = $$getBundlePath("TaoQuickApp") + +load(taoBuildPath) +setBuildPath($${TaoQuick_BUILD_TREE}/$${TARGET}) + +CONFIG(debug,debug|release) { + DESTDIR = $${TaoQuick_RUN_TREE}/debug +} else { + DESTDIR = $${TaoQuick_RUN_TREE}/release +} + +include(TaoQuickApp.pri) win32:!mingw { RC_FILE = App.rc @@ -11,28 +23,3 @@ win32:!mingw { macos { ICON = milk.icns } - -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) { - MOC_DIR = build/debug/moc - RCC_DIR = build/debug/rcc - UI_DIR = build/debug/ui - OBJECTS_DIR = build/debug/obj -} else { - MOC_DIR = build/release/moc - RCC_DIR = build/release/rcc - UI_DIR = build/release/ui - OBJECTS_DIR = build/release/obj -} -include(TaoQuickApp.pri) - - -!android { - trans.files = $$files($$_PRO_FILE_PWD_/Trans/language_*.json) - trans.path = $$DESTDIR/Trans - COPIES += trans -} diff --git a/src/TaoQuickApp/Ver-u16.h b/src/TaoQuickApp/Ver-u16.h index effad52f54c3a5b9cdf8a91f3c19d728b684d992..7200d305294ad6827a4bf3b9acdcb99d7c82ed7e 100644 GIT binary patch delta 16 YcmbQl|BY`$0rO-Q7NyPWn4d5M05hir(EtDd delta 41 xcmeyyH;I2k0kez_gI44l4iv diff --git a/src/TaoQuickApp/Ver-u8.h b/src/TaoQuickApp/Ver-u8.h index 38cc52d..facf688 100644 --- a/src/TaoQuickApp/Ver-u8.h +++ b/src/TaoQuickApp/Ver-u8.h @@ -13,7 +13,7 @@ #define VER_COMPANYNAME_STR "JaredTao\0" -#define VER_FILEDESCRIPTION_STR "TaoQuickDemo,未经授权不得商用,侵权必究\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" diff --git a/src/TaoQuickPlugin/TaoQuickPlugin.pro b/src/TaoQuickPlugin/TaoQuickPlugin.pro index ec56f36..fdd44ef 100644 --- a/src/TaoQuickPlugin/TaoQuickPlugin.pro +++ b/src/TaoQuickPlugin/TaoQuickPlugin.pro @@ -9,8 +9,20 @@ msvc { QMAKE_CXXFLAGS += -source-charset:utf-8 } load(taoVersion) + include(../TaoPlugin.pri) -include(../TaoBundle.pri) + +load(taoBundle) +BundlePath = $$getBundlePath("TaoQuickApp") + +load(taoBuildPath) +setBuildPath($${TaoQuick_BUILD_TREE}/$${TARGET}) + +CONFIG(debug, debug|release){ + DESTDIR=$${TaoQuick_RUN_TREE}/debug/$${BundlePath}TaoPlugin +} else { + DESTDIR=$${TaoQuick_RUN_TREE}/release/$${BundlePath}TaoPlugin +} SOURCES += \ Src/TaoQuickPlugin.cpp @@ -20,26 +32,3 @@ HEADERS += \ RESOURCES += \ Qml.qrc -CONFIG(debug, debug|release){ - tgt=$$absolute_path($${_PRO_FILE_PWD_}/../../bin/debug/$${BundlePath}TaoPlugin) -} else { - tgt=$$absolute_path($${_PRO_FILE_PWD_}/../../bin/release/$${BundlePath}TaoPlugin) -} -win32 { - tgt ~= s,/,\\\\,g -} -DESTDIR = $${tgt} -CONFIG(debug,debug|release){ - MOC_DIR = build/debug/moc - RCC_DIR = build/debug/rcc - UI_DIR = build/debug/ui - OBJECTS_DIR = build/debug/obj -} else { - MOC_DIR = build/release/moc - RCC_DIR = build/release/rcc - UI_DIR = build/release/ui - OBJECTS_DIR = build/release/obj -} -OTHER_FILES += README.md \ - .clang-format \ - LICENSE