1
0
mirror of https://gitee.com/drabel/LibQQt.git synced 2025-01-04 10:18:44 +08:00

move QQt to QQtBase

This commit is contained in:
tianduanrui 2018-06-06 16:53:21 +08:00
parent 4d11ac5c3d
commit 1ddf0380c5
54 changed files with 65 additions and 58 deletions

View File

@ -88,7 +88,7 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)
#-------------------------------------------------
##project environ

View File

@ -47,4 +47,4 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)

View File

@ -54,7 +54,7 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)
#发布配置文件 把AppRoot里的配置项目拷贝到运行目录和发布目录
add_deploy_config($${PWD}/AppRoot)

View File

@ -55,7 +55,7 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)
#发布配置文件 把AppRoot里的配置项目拷贝到运行目录和发布目录
add_deploy_config($${PWD}/AppRoot)

View File

@ -97,7 +97,7 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)
#-------------------------------------------------
##project environ

View File

@ -48,4 +48,4 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)

View File

@ -90,7 +90,7 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)
#-------------------------------------------------
##project environ

View File

@ -84,7 +84,7 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)
#-------------------------------------------------
##project environ

View File

@ -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

View File

@ -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)

View File

@ -74,7 +74,7 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)
#-------------------------------------------------
##project environ

View File

@ -38,5 +38,5 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)

View File

@ -102,7 +102,7 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)
#-------------------------------------------------
##project environ

View File

@ -63,7 +63,7 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)
#发布配置文件 把AppRoot里的配置项目拷贝到运行目录和发布目录
add_deploy_config($${PWD}/AppRoot)

View File

@ -90,7 +90,7 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)
#-------------------------------------------------
##project environ

View File

@ -90,7 +90,7 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)
#-------------------------------------------------

View File

@ -71,7 +71,7 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)
#-------------------------------------------------
##project environ

View File

@ -41,4 +41,4 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)

View File

@ -84,5 +84,5 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)

View File

@ -58,5 +58,5 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)

View File

@ -62,5 +62,5 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)

View File

@ -89,7 +89,7 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)
#-------------------------------------------------

View File

@ -90,7 +90,7 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)
#-------------------------------------------------

@ -1 +1 @@
Subproject commit aee299965a2c4bcb0ce271f3439a6ec0cb8ac005
Subproject commit 5c60e01407f80b1f04c3e80c7fcd7318051805b2

View File

@ -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.

View File

@ -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)

View File

@ -47,7 +47,7 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)
#发布配置文件 把AppRoot里的配置项目拷贝到运行目录和发布目录
add_deploy_config($${PWD}/AppRoot)

View File

@ -47,5 +47,5 @@ add_deploy()
#app链接library lib也会链接
#app发布library 只有app才会发布
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)
add_dependent_manager(QwtPlot3d)

View File

@ -50,7 +50,7 @@ add_deploy()
#app链接library lib也会链接
#app发布library 只有app才会发布
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)
add_dependent_manager(Qwt)
#打印状态

View File

@ -42,4 +42,4 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)

View File

@ -42,7 +42,7 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)
#发布配置文件 把AppRoot里的配置项目拷贝到运行目录和发布目录
add_deploy_config($${PWD}/AppRoot)

View File

@ -46,5 +46,5 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)

View File

@ -74,7 +74,7 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)
#-------------------------------------------------
##project environ

View File

@ -87,7 +87,7 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)
#-------------------------------------------------
##project environ

View File

@ -46,5 +46,5 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)

View File

@ -60,7 +60,7 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)
#-------------------------------------------------

View File

@ -86,7 +86,7 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)
#-------------------------------------------------

View File

@ -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)

View File

@ -73,7 +73,7 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)
#-------------------------------------------------

View File

@ -51,7 +51,7 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)
#发布配置文件 把AppRoot里的配置项目拷贝到运行目录和发布目录
add_deploy_config($${PWD}/AppRoot)

View File

@ -53,5 +53,5 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)

View File

@ -48,7 +48,7 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)
#发布配置文件 把AppRoot里的配置项目拷贝到运行目录和发布目录
add_deploy_config($${PWD}/AppRoot)

View File

@ -93,7 +93,7 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)
#-------------------------------------------------

View File

@ -83,7 +83,7 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)
#-------------------------------------------------

View File

@ -49,4 +49,4 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)

View File

@ -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)

View File

@ -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)

View File

@ -43,5 +43,5 @@ add_deploy()
#app链接library lib也会链接
#app发布library 只有app才会发布
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)
add_dependent_manager(log4cpp)

View File

@ -74,7 +74,7 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)
#-------------------------------------------------

View File

@ -73,7 +73,7 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)
#-------------------------------------------------

View File

@ -91,7 +91,7 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)
#发布配置文件 把AppRoot里的配置项目拷贝到运行目录和发布目录
add_deploy_config($${PWD}/AppRoot)

View File

@ -48,5 +48,5 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)

View File

@ -93,7 +93,7 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)
#-------------------------------------------------
##project environ

View File

@ -62,7 +62,7 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager(QQt)
add_dependent_manager(QQtBase)
#发布配置文件 把AppRoot里的配置项目拷贝到运行目录和发布目录
add_deploy_config($${PWD}/AppRoot)