From 1ddf0380c5ec51dd134e23d32bfc3272dcdf5c67 Mon Sep 17 00:00:00 2001 From: tianduanrui Date: Wed, 6 Jun 2018 16:53:21 +0800 Subject: [PATCH] move QQt to QQtBase --- demo/GuiBuildTool/GuiBuildTool.pro | 2 +- demo/LearnCookieTest/LearnCookieTest.pro | 2 +- demo/QQtClientCreator/QQtClientCreator.pro | 2 +- demo/QQtServerCreator/QQtServerCreator.pro | 2 +- demo/QtSdkManager/QtSdkManager.pro | 2 +- demo/SysInfoNotify/SysInfoNotify.pro | 2 +- demo/VegeTablesPrice/VegeTablesPrice.pro | 2 +- demo/soapQQtOnline/soapQQtOnline.pro | 2 +- examples/QQtOpenCVExample/QQtOpenCVExample.pro | 2 +- .../QQtOpenSceneGraphExample.pro | 2 +- examples/animationframe/animationframe.pro | 2 +- examples/console_app/console_app.pro | 2 +- examples/exquisite/exquisite.pro | 2 +- examples/qqtaudioexample/qqtaudioexample.pro | 2 +- examples/qqtchartexample/qqtchartexample.pro | 2 +- examples/qqtclientexample/qqtclientexample.pro | 2 +- examples/qqtframe/qqtframe.pro | 2 +- examples/qqtframe2/qqtframe2.pro | 2 +- .../qqtnetworkexample/qqtnetworkexample.pro | 2 +- examples/qqtserverexample/qqtserverexample.pro | 2 +- examples/qqtudpexample/qqtudpexample.pro | 2 +- examples/qrcodeexample/qrcodeexample.pro | 2 +- .../tabwidgetexamples/tabwidgetexamples.pro | 2 +- multi-link | 2 +- src/qqt.pro | 17 ++++++++++++----- test/QQtFMODTest/QQtFMODTest.pro | 2 +- .../QQtMultiLinkApp/QQtMultiLinkApp.pro | 2 +- test/QQtQwtPlot3DTest/QQtQwtPlot3DTest.pro | 2 +- test/QQtQwtTest/QQtQwtTest.pro | 2 +- .../QQtWidgetClickHelperTest.pro | 2 +- .../QQtWidgetClickSoundHelperTest.pro | 2 +- test/bytearraytest/bytearraytest.pro | 2 +- test/cmdwidget/cmdwidget.pro | 2 +- test/coretest/coretest.pro | 2 +- test/customqvariant/customqvariant.pro | 2 +- test/easter/easter.pro | 2 +- .../framelesshelperwidget.pro | 2 +- test/giftest/giftest.pro | 2 +- test/gumbo_query_test/gumbo_query_test.pro | 2 +- test/inputtest/inputtest.pro | 2 +- test/openglwidgettest/openglwidgettest.pro | 2 +- test/osdtest/osdtest.pro | 2 +- test/qqtbtfileserver/qqtbtfileserver.pro | 2 +- test/qqtdicttest/qqtdicttest.pro | 2 +- test/qqtdicttest2/qqtdicttest2.pro | 2 +- test/qqtffmpegplayer/qqtffmpegplayer.pro | 2 +- test/qqtliveplayer/qqtliveplayer.pro | 2 +- test/qqtlog4cpptest/qqtlog4cpptest.pro | 2 +- test/qqtwebclient/qqtwebclient.pro | 2 +- test/qqtwebkittest/qqtwebkittest.pro | 2 +- test/svgtest/svgtest.pro | 2 +- test/tmpproj/tmpproj.pro | 2 +- test/treeviewtest/treeviewtest.pro | 2 +- test/voicetest/voicetest.pro | 2 +- 54 files changed, 65 insertions(+), 58 deletions(-) diff --git a/demo/GuiBuildTool/GuiBuildTool.pro b/demo/GuiBuildTool/GuiBuildTool.pro index 233a9081..92aa49a2 100644 --- a/demo/GuiBuildTool/GuiBuildTool.pro +++ b/demo/GuiBuildTool/GuiBuildTool.pro @@ -88,7 +88,7 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) #------------------------------------------------- ##project environ diff --git a/demo/LearnCookieTest/LearnCookieTest.pro b/demo/LearnCookieTest/LearnCookieTest.pro index dcd9db4a..8e6b8d52 100644 --- a/demo/LearnCookieTest/LearnCookieTest.pro +++ b/demo/LearnCookieTest/LearnCookieTest.pro @@ -47,4 +47,4 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) diff --git a/demo/QQtClientCreator/QQtClientCreator.pro b/demo/QQtClientCreator/QQtClientCreator.pro index f14526a3..5afd5560 100644 --- a/demo/QQtClientCreator/QQtClientCreator.pro +++ b/demo/QQtClientCreator/QQtClientCreator.pro @@ -54,7 +54,7 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) #发布配置文件 把AppRoot里的配置项目拷贝到运行目录和发布目录 add_deploy_config($${PWD}/AppRoot) diff --git a/demo/QQtServerCreator/QQtServerCreator.pro b/demo/QQtServerCreator/QQtServerCreator.pro index 9c5de15a..265ebc2a 100644 --- a/demo/QQtServerCreator/QQtServerCreator.pro +++ b/demo/QQtServerCreator/QQtServerCreator.pro @@ -55,7 +55,7 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) #发布配置文件 把AppRoot里的配置项目拷贝到运行目录和发布目录 add_deploy_config($${PWD}/AppRoot) diff --git a/demo/QtSdkManager/QtSdkManager.pro b/demo/QtSdkManager/QtSdkManager.pro index 7601c5d6..ec07f46e 100644 --- a/demo/QtSdkManager/QtSdkManager.pro +++ b/demo/QtSdkManager/QtSdkManager.pro @@ -97,7 +97,7 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) #------------------------------------------------- ##project environ diff --git a/demo/SysInfoNotify/SysInfoNotify.pro b/demo/SysInfoNotify/SysInfoNotify.pro index 98799fc2..8f16a22b 100644 --- a/demo/SysInfoNotify/SysInfoNotify.pro +++ b/demo/SysInfoNotify/SysInfoNotify.pro @@ -48,4 +48,4 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) diff --git a/demo/VegeTablesPrice/VegeTablesPrice.pro b/demo/VegeTablesPrice/VegeTablesPrice.pro index f8844826..53479fce 100644 --- a/demo/VegeTablesPrice/VegeTablesPrice.pro +++ b/demo/VegeTablesPrice/VegeTablesPrice.pro @@ -90,7 +90,7 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) #------------------------------------------------- ##project environ diff --git a/demo/soapQQtOnline/soapQQtOnline.pro b/demo/soapQQtOnline/soapQQtOnline.pro index d9cf2a15..9a53dfaf 100644 --- a/demo/soapQQtOnline/soapQQtOnline.pro +++ b/demo/soapQQtOnline/soapQQtOnline.pro @@ -84,7 +84,7 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) #------------------------------------------------- ##project environ diff --git a/examples/QQtOpenCVExample/QQtOpenCVExample.pro b/examples/QQtOpenCVExample/QQtOpenCVExample.pro index bb05ed35..66107f2a 100644 --- a/examples/QQtOpenCVExample/QQtOpenCVExample.pro +++ b/examples/QQtOpenCVExample/QQtOpenCVExample.pro @@ -49,7 +49,7 @@ include (../../app-lib/add_library_OpenCV.pri) #这里做的事情，可以拷贝custom manager到app目录里再custom manager里面完成。 add_version(1,0,0,0) add_deploy() -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) add_deploy_config($$PWD/AppRoot) #添加其他library diff --git a/examples/QQtOpenSceneGraphExample/QQtOpenSceneGraphExample.pro b/examples/QQtOpenSceneGraphExample/QQtOpenSceneGraphExample.pro index 4c2d5b4a..c8daddf5 100644 --- a/examples/QQtOpenSceneGraphExample/QQtOpenSceneGraphExample.pro +++ b/examples/QQtOpenSceneGraphExample/QQtOpenSceneGraphExample.pro @@ -41,7 +41,7 @@ include (../../app-lib/add_library_OpenSceneGraph.pri) system(touch mainwindow.cpp) add_version(1,0,0,0) add_deploy() -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) mingw{ #Qt is static, but osg is dynamic #add_defines(OSG_LIBRARY_STATIC) diff --git a/examples/animationframe/animationframe.pro b/examples/animationframe/animationframe.pro index 7612c8ca..2c33aa7e 100644 --- a/examples/animationframe/animationframe.pro +++ b/examples/animationframe/animationframe.pro @@ -74,7 +74,7 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) #------------------------------------------------- ##project environ diff --git a/examples/console_app/console_app.pro b/examples/console_app/console_app.pro index 05cbe69b..780d23fa 100644 --- a/examples/console_app/console_app.pro +++ b/examples/console_app/console_app.pro @@ -38,5 +38,5 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) diff --git a/examples/exquisite/exquisite.pro b/examples/exquisite/exquisite.pro index e54555be..2dfe9566 100644 --- a/examples/exquisite/exquisite.pro +++ b/examples/exquisite/exquisite.pro @@ -102,7 +102,7 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) #------------------------------------------------- ##project environ diff --git a/examples/qqtaudioexample/qqtaudioexample.pro b/examples/qqtaudioexample/qqtaudioexample.pro index fcba30ab..5ed8aa6a 100644 --- a/examples/qqtaudioexample/qqtaudioexample.pro +++ b/examples/qqtaudioexample/qqtaudioexample.pro @@ -63,7 +63,7 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) #发布配置文件 把AppRoot里的配置项目拷贝到运行目录和发布目录 add_deploy_config($${PWD}/AppRoot) diff --git a/examples/qqtchartexample/qqtchartexample.pro b/examples/qqtchartexample/qqtchartexample.pro index a903df75..51d4c26c 100644 --- a/examples/qqtchartexample/qqtchartexample.pro +++ b/examples/qqtchartexample/qqtchartexample.pro @@ -90,7 +90,7 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) #------------------------------------------------- ##project environ diff --git a/examples/qqtclientexample/qqtclientexample.pro b/examples/qqtclientexample/qqtclientexample.pro index e1f62f6a..80ab41db 100644 --- a/examples/qqtclientexample/qqtclientexample.pro +++ b/examples/qqtclientexample/qqtclientexample.pro @@ -90,7 +90,7 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) #------------------------------------------------- diff --git a/examples/qqtframe/qqtframe.pro b/examples/qqtframe/qqtframe.pro index e0cb8aa6..27a803ca 100644 --- a/examples/qqtframe/qqtframe.pro +++ b/examples/qqtframe/qqtframe.pro @@ -71,7 +71,7 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) #------------------------------------------------- ##project environ diff --git a/examples/qqtframe2/qqtframe2.pro b/examples/qqtframe2/qqtframe2.pro index 490df504..061d7335 100644 --- a/examples/qqtframe2/qqtframe2.pro +++ b/examples/qqtframe2/qqtframe2.pro @@ -41,4 +41,4 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) diff --git a/examples/qqtnetworkexample/qqtnetworkexample.pro b/examples/qqtnetworkexample/qqtnetworkexample.pro index 0b0bd09e..6808b47b 100644 --- a/examples/qqtnetworkexample/qqtnetworkexample.pro +++ b/examples/qqtnetworkexample/qqtnetworkexample.pro @@ -84,5 +84,5 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) diff --git a/examples/qqtserverexample/qqtserverexample.pro b/examples/qqtserverexample/qqtserverexample.pro index e61908fc..0eec2b81 100644 --- a/examples/qqtserverexample/qqtserverexample.pro +++ b/examples/qqtserverexample/qqtserverexample.pro @@ -58,5 +58,5 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) diff --git a/examples/qqtudpexample/qqtudpexample.pro b/examples/qqtudpexample/qqtudpexample.pro index ae0286ee..f15ad284 100644 --- a/examples/qqtudpexample/qqtudpexample.pro +++ b/examples/qqtudpexample/qqtudpexample.pro @@ -62,5 +62,5 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) diff --git a/examples/qrcodeexample/qrcodeexample.pro b/examples/qrcodeexample/qrcodeexample.pro index 895c9f6c..dd512237 100644 --- a/examples/qrcodeexample/qrcodeexample.pro +++ b/examples/qrcodeexample/qrcodeexample.pro @@ -89,7 +89,7 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) #------------------------------------------------- diff --git a/examples/tabwidgetexamples/tabwidgetexamples.pro b/examples/tabwidgetexamples/tabwidgetexamples.pro index afb59d43..a727c752 100644 --- a/examples/tabwidgetexamples/tabwidgetexamples.pro +++ b/examples/tabwidgetexamples/tabwidgetexamples.pro @@ -90,7 +90,7 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) #------------------------------------------------- diff --git a/multi-link b/multi-link index aee29996..5c60e014 160000 --- a/multi-link +++ b/multi-link @@ -1 +1 @@ -Subproject commit aee299965a2c4bcb0ce271f3439a6ec0cb8ac005 +Subproject commit 5c60e01407f80b1f04c3e80c7fcd7318051805b2 diff --git a/src/qqt.pro b/src/qqt.pro index 5d5b7f95..9d703724 100644 --- a/src/qqt.pro +++ b/src/qqt.pro @@ -29,7 +29,7 @@ ################################################################# ##project name ################################################################# -TARGET = QQtCore +TARGET = QQtBase TEMPLATE = lib ################################################################# @@ -62,7 +62,13 @@ DEFINES += QQT_VERSION=$$APP_VERSION ################################################################# ##project header ################################################################# -include ($$PWD/qqt_header.pri) +#qqt_header.pri不再使用，而是直接修改multi-link里的add_library_QQtBase.pri +#方便链接者跟随最新的QQt变动，方便编辑者不必重复操作include代码。 +#include ($$PWD/qqt_header.pri) + +#使用add_library_XXX.pri导出include和defines +#对这个pri的调用，使用add_export_manager() +add_export_manager($$add_target_name()) ################################################################# ##project source @@ -78,6 +84,7 @@ include ($$PWD/qqt_source.pri) #add_source_dir($$PWD) #add_build_dir($$DESTDIR) +#导出include和library #目标 #源代码目录 #编译在相对编译目录 @@ -91,9 +98,9 @@ add_sdk_header(QQt, $$add_target_name(), QQtApplication, frame) ################################################################# QMAKE_TARGET_FILE = "$${TARGET}" QMAKE_TARGET_PRODUCT = "$${TARGET}" -QMAKE_TARGET_COMPANY = "www.QQt.com" -QMAKE_TARGET_DESCRIPTION = "QQt Foundation Class" -QMAKE_TARGET_COPYRIGHT = "Copyright 2017-2022 QQt Co., Ltd. All rights reserved" +QMAKE_TARGET_COMPANY = "www.$${TARGET}.com" +QMAKE_TARGET_DESCRIPTION = "$${TARGET} Foundation Class" +QMAKE_TARGET_COPYRIGHT = "Copyright 2017-2042 $${TARGET} Co., Ltd. All rights reserved" win32 { #common to use upload, this can be ignored. diff --git a/test/QQtFMODTest/QQtFMODTest.pro b/test/QQtFMODTest/QQtFMODTest.pro index a5e5494b..3b262036 100644 --- a/test/QQtFMODTest/QQtFMODTest.pro +++ b/test/QQtFMODTest/QQtFMODTest.pro @@ -39,5 +39,5 @@ include (../../app-lib/add_custom_manager.pri) add_version(1,0,0,0) add_deploy() -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) add_dependent_manager(FMOD) diff --git a/test/QQtMultiLinkTest/QQtMultiLinkApp/QQtMultiLinkApp.pro b/test/QQtMultiLinkTest/QQtMultiLinkApp/QQtMultiLinkApp.pro index c19d4c20..ca849e2c 100644 --- a/test/QQtMultiLinkTest/QQtMultiLinkApp/QQtMultiLinkApp.pro +++ b/test/QQtMultiLinkTest/QQtMultiLinkApp/QQtMultiLinkApp.pro @@ -47,7 +47,7 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) #发布配置文件 把AppRoot里的配置项目拷贝到运行目录和发布目录 add_deploy_config($${PWD}/AppRoot) diff --git a/test/QQtQwtPlot3DTest/QQtQwtPlot3DTest.pro b/test/QQtQwtPlot3DTest/QQtQwtPlot3DTest.pro index 919d9e78..8f51ed44 100644 --- a/test/QQtQwtPlot3DTest/QQtQwtPlot3DTest.pro +++ b/test/QQtQwtPlot3DTest/QQtQwtPlot3DTest.pro @@ -47,5 +47,5 @@ add_deploy() #app链接library lib也会链接 #app发布library 只有app才会发布 -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) add_dependent_manager(QwtPlot3d) diff --git a/test/QQtQwtTest/QQtQwtTest.pro b/test/QQtQwtTest/QQtQwtTest.pro index c94b62fd..61a5c702 100644 --- a/test/QQtQwtTest/QQtQwtTest.pro +++ b/test/QQtQwtTest/QQtQwtTest.pro @@ -50,7 +50,7 @@ add_deploy() #app链接library lib也会链接 #app发布library 只有app才会发布 -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) add_dependent_manager(Qwt) #打印状态 diff --git a/test/QQtWidgetClickHelperTest/QQtWidgetClickHelperTest.pro b/test/QQtWidgetClickHelperTest/QQtWidgetClickHelperTest.pro index 8d34a97c..90a10831 100644 --- a/test/QQtWidgetClickHelperTest/QQtWidgetClickHelperTest.pro +++ b/test/QQtWidgetClickHelperTest/QQtWidgetClickHelperTest.pro @@ -42,4 +42,4 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) diff --git a/test/QQtWidgetClickSoundHelperTest/QQtWidgetClickSoundHelperTest.pro b/test/QQtWidgetClickSoundHelperTest/QQtWidgetClickSoundHelperTest.pro index 80c418b6..4e8d2118 100644 --- a/test/QQtWidgetClickSoundHelperTest/QQtWidgetClickSoundHelperTest.pro +++ b/test/QQtWidgetClickSoundHelperTest/QQtWidgetClickSoundHelperTest.pro @@ -42,7 +42,7 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) #发布配置文件 把AppRoot里的配置项目拷贝到运行目录和发布目录 add_deploy_config($${PWD}/AppRoot) diff --git a/test/bytearraytest/bytearraytest.pro b/test/bytearraytest/bytearraytest.pro index 3e8d5229..4d4f971b 100644 --- a/test/bytearraytest/bytearraytest.pro +++ b/test/bytearraytest/bytearraytest.pro @@ -46,5 +46,5 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) diff --git a/test/cmdwidget/cmdwidget.pro b/test/cmdwidget/cmdwidget.pro index 03eb0171..29e62a42 100644 --- a/test/cmdwidget/cmdwidget.pro +++ b/test/cmdwidget/cmdwidget.pro @@ -74,7 +74,7 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) #------------------------------------------------- ##project environ diff --git a/test/coretest/coretest.pro b/test/coretest/coretest.pro index af6b0fcd..82fb6e4b 100644 --- a/test/coretest/coretest.pro +++ b/test/coretest/coretest.pro @@ -87,7 +87,7 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) #------------------------------------------------- ##project environ diff --git a/test/customqvariant/customqvariant.pro b/test/customqvariant/customqvariant.pro index 8e2b750c..c395a31d 100644 --- a/test/customqvariant/customqvariant.pro +++ b/test/customqvariant/customqvariant.pro @@ -46,5 +46,5 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) diff --git a/test/easter/easter.pro b/test/easter/easter.pro index c543f111..990d4474 100644 --- a/test/easter/easter.pro +++ b/test/easter/easter.pro @@ -60,7 +60,7 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) #------------------------------------------------- diff --git a/test/framelesshelperwidget/framelesshelperwidget.pro b/test/framelesshelperwidget/framelesshelperwidget.pro index e03f1696..2a1ef86f 100644 --- a/test/framelesshelperwidget/framelesshelperwidget.pro +++ b/test/framelesshelperwidget/framelesshelperwidget.pro @@ -86,7 +86,7 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) #------------------------------------------------- diff --git a/test/giftest/giftest.pro b/test/giftest/giftest.pro index 48d6538d..3696422f 100644 --- a/test/giftest/giftest.pro +++ b/test/giftest/giftest.pro @@ -64,7 +64,7 @@ add_deploy() #libQQt从sdk到build和deploy #include (../../app-lib/add_library_QQt.pri) #add_dependent_library(QQt) -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) #发布配置文件 把AppRoot里的配置项目拷贝到运行目录和发布目录 add_deploy_config($${PWD}/AppRoot) diff --git a/test/gumbo_query_test/gumbo_query_test.pro b/test/gumbo_query_test/gumbo_query_test.pro index 120f9f7a..1a8a1103 100644 --- a/test/gumbo_query_test/gumbo_query_test.pro +++ b/test/gumbo_query_test/gumbo_query_test.pro @@ -73,7 +73,7 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) #------------------------------------------------- diff --git a/test/inputtest/inputtest.pro b/test/inputtest/inputtest.pro index f2b7cbbd..6c0855b4 100644 --- a/test/inputtest/inputtest.pro +++ b/test/inputtest/inputtest.pro @@ -51,7 +51,7 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) #发布配置文件 把AppRoot里的配置项目拷贝到运行目录和发布目录 add_deploy_config($${PWD}/AppRoot) diff --git a/test/openglwidgettest/openglwidgettest.pro b/test/openglwidgettest/openglwidgettest.pro index 8b31b0eb..b6ab04d1 100644 --- a/test/openglwidgettest/openglwidgettest.pro +++ b/test/openglwidgettest/openglwidgettest.pro @@ -53,5 +53,5 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) diff --git a/test/osdtest/osdtest.pro b/test/osdtest/osdtest.pro index 5bbb2d31..42e84f39 100644 --- a/test/osdtest/osdtest.pro +++ b/test/osdtest/osdtest.pro @@ -48,7 +48,7 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) #发布配置文件 把AppRoot里的配置项目拷贝到运行目录和发布目录 add_deploy_config($${PWD}/AppRoot) diff --git a/test/qqtbtfileserver/qqtbtfileserver.pro b/test/qqtbtfileserver/qqtbtfileserver.pro index d920ce2f..bfa8cd5c 100644 --- a/test/qqtbtfileserver/qqtbtfileserver.pro +++ b/test/qqtbtfileserver/qqtbtfileserver.pro @@ -93,7 +93,7 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) #------------------------------------------------- diff --git a/test/qqtdicttest/qqtdicttest.pro b/test/qqtdicttest/qqtdicttest.pro index 9540c789..c850da83 100644 --- a/test/qqtdicttest/qqtdicttest.pro +++ b/test/qqtdicttest/qqtdicttest.pro @@ -83,7 +83,7 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) #------------------------------------------------- diff --git a/test/qqtdicttest2/qqtdicttest2.pro b/test/qqtdicttest2/qqtdicttest2.pro index 5ea2cb33..d265bde6 100644 --- a/test/qqtdicttest2/qqtdicttest2.pro +++ b/test/qqtdicttest2/qqtdicttest2.pro @@ -49,4 +49,4 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) diff --git a/test/qqtffmpegplayer/qqtffmpegplayer.pro b/test/qqtffmpegplayer/qqtffmpegplayer.pro index bbeee64f..3b625275 100644 --- a/test/qqtffmpegplayer/qqtffmpegplayer.pro +++ b/test/qqtffmpegplayer/qqtffmpegplayer.pro @@ -34,6 +34,6 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) add_dependent_manager(FFmpeg4.0) add_dependent_manager(SDL2) diff --git a/test/qqtliveplayer/qqtliveplayer.pro b/test/qqtliveplayer/qqtliveplayer.pro index e599790d..d36c9532 100644 --- a/test/qqtliveplayer/qqtliveplayer.pro +++ b/test/qqtliveplayer/qqtliveplayer.pro @@ -38,7 +38,7 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) #添加其他library #libVLCQt从sdk到build和deploy add_dependent_manager(VLC) diff --git a/test/qqtlog4cpptest/qqtlog4cpptest.pro b/test/qqtlog4cpptest/qqtlog4cpptest.pro index 6dad661f..21338b1a 100644 --- a/test/qqtlog4cpptest/qqtlog4cpptest.pro +++ b/test/qqtlog4cpptest/qqtlog4cpptest.pro @@ -43,5 +43,5 @@ add_deploy() #app链接library lib也会链接 #app发布library 只有app才会发布 -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) add_dependent_manager(log4cpp) diff --git a/test/qqtwebclient/qqtwebclient.pro b/test/qqtwebclient/qqtwebclient.pro index ce98192b..77ef9f74 100644 --- a/test/qqtwebclient/qqtwebclient.pro +++ b/test/qqtwebclient/qqtwebclient.pro @@ -74,7 +74,7 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) #------------------------------------------------- diff --git a/test/qqtwebkittest/qqtwebkittest.pro b/test/qqtwebkittest/qqtwebkittest.pro index 7d4ce969..67dd7e99 100644 --- a/test/qqtwebkittest/qqtwebkittest.pro +++ b/test/qqtwebkittest/qqtwebkittest.pro @@ -73,7 +73,7 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) #------------------------------------------------- diff --git a/test/svgtest/svgtest.pro b/test/svgtest/svgtest.pro index 923b10be..1a0a139c 100644 --- a/test/svgtest/svgtest.pro +++ b/test/svgtest/svgtest.pro @@ -91,7 +91,7 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) #发布配置文件 把AppRoot里的配置项目拷贝到运行目录和发布目录 add_deploy_config($${PWD}/AppRoot) diff --git a/test/tmpproj/tmpproj.pro b/test/tmpproj/tmpproj.pro index 1d94aea1..509d7131 100644 --- a/test/tmpproj/tmpproj.pro +++ b/test/tmpproj/tmpproj.pro @@ -48,5 +48,5 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) diff --git a/test/treeviewtest/treeviewtest.pro b/test/treeviewtest/treeviewtest.pro index 47cae158..b4e08f7b 100644 --- a/test/treeviewtest/treeviewtest.pro +++ b/test/treeviewtest/treeviewtest.pro @@ -93,7 +93,7 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) #------------------------------------------------- ##project environ diff --git a/test/voicetest/voicetest.pro b/test/voicetest/voicetest.pro index 75da5359..0136d86b 100644 --- a/test/voicetest/voicetest.pro +++ b/test/voicetest/voicetest.pro @@ -62,7 +62,7 @@ add_deploy() #后发布依赖 #libQQt从sdk到build和deploy -add_dependent_manager(QQt) +add_dependent_manager(QQtBase) #发布配置文件 把AppRoot里的配置项目拷贝到运行目录和发布目录 add_deploy_config($${PWD}/AppRoot)