QT/LibQQt
1
0
Fork 0
mirror of https://gitee.com/drabel/LibQQt.git synced 2025-01-04 10:18:44 +08:00
Code Issues Projects Releases Wiki Activity

fix some link

Browse Source
This commit is contained in:
tianduanrui 2018-06-02 20:52:43 +08:00
parent dc953bb44f
commit 7fabc65a22
61 changed files with 153 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
QQtExample_Temp.pro
View File

@ -35,15 +35,16 @@ SUBDIRS =
#所有的依赖添加pri都位于QQt/app-lib里，暂时除了QQt的不能移动，其他的pri都可以移动。
########################################################################################
#need OpenCV SDK
#SUBDIRS += examples/QQtOpenCVExample
#
SUBDIRS += examples/QQtOpenCVExample
#need OSG SDK
#need win SDK
#string is not a type?
#SUBDIRS += examples/QQtOpenSceneGraphExample
#need Qwt SDK
#
SUBDIRS += test/QQtQwtTest
#SUBDIRS += test/QQtQwtTest
#need QwtPlot3D sdk
#SUBDIRS += test/QQtQwtPlot3DTest

25
app-lib/add_library_OpenCV.pri
View File

@ -51,19 +51,20 @@ defineTest(add_include_path_OpenCV){
}
defineTest(add_library_OpenCV){
add_library_path(OpenCV)
#链接Library
add_library(OpenCV, opencv_calib3d$${LIBRARYVER}$${DEBUG})
add_library(OpenCV, opencv_contrib$${LIBRARYVER}$${DEBUG})
add_library(OpenCV, opencv_core$${LIBRARYVER}$${DEBUG})
add_library(OpenCV, opencv_features2d$${LIBRARYVER}$${DEBUG})
add_library(OpenCV, opencv_flann$${LIBRARYVER}$${DEBUG})
add_library(OpenCV, opencv_gpu$${LIBRARYVER}$${DEBUG})
add_library(OpenCV, opencv_highgui$${LIBRARYVER}$${DEBUG})
add_library(OpenCV, opencv_imgproc$${LIBRARYVER}$${DEBUG})
add_library(OpenCV, opencv_legacy$${LIBRARYVER}$${DEBUG})
add_library(OpenCV, opencv_ml$${LIBRARYVER}$${DEBUG})
add_library(OpenCV, opencv_objdetect$${LIBRARYVER}$${DEBUG})
add_library(OpenCV, opencv_video$${LIBRARYVER}$${DEBUG})
add_library(opencv_calib3d$${LIBRARYVER}$${DEBUG})
add_library(opencv_contrib$${LIBRARYVER}$${DEBUG})
add_library(opencv_core$${LIBRARYVER}$${DEBUG})
add_library(opencv_features2d$${LIBRARYVER}$${DEBUG})
add_library(opencv_flann$${LIBRARYVER}$${DEBUG})
add_library(opencv_gpu$${LIBRARYVER}$${DEBUG})
add_library(opencv_highgui$${LIBRARYVER}$${DEBUG})
add_library(opencv_imgproc$${LIBRARYVER}$${DEBUG})
add_library(opencv_legacy$${LIBRARYVER}$${DEBUG})
add_library(opencv_ml$${LIBRARYVER}$${DEBUG})
add_library(opencv_objdetect$${LIBRARYVER}$${DEBUG})
add_library(opencv_video$${LIBRARYVER}$${DEBUG})
return (1)
}

45
app-lib/add_library_OpenSceneGraph.pri
View File

@ -49,33 +49,35 @@ defineReplace(get_add_include_path_OpenSceneGraph){
defineTest(add_include_path_OpenSceneGraph){
#包含OpenSceneGraph头文件的过程
header_path = $$get_add_include_path(OpenSceneGraph)
header_path = $$get_add_include_path(OpenSceneGraph, , , , "qtversionpath")
INCLUDEPATH += $$get_add_include_path_OpenSceneGraph($$header_path)
export(INCLUDEPATH)
return (1)
}
defineTest(add_library_OpenSceneGraph) {
#添加Library路径
add_library_path(OpenSceneGraph, , , "qtversionpath")
#链接Library
add_library(OpenSceneGraph, OpenThreads$${LIBRARYVER}$${DEBUG})
add_library(OpenSceneGraph, osg$${LIBRARYVER}$${DEBUG})
add_library(OpenSceneGraph, osgAnimation$${LIBRARYVER}$${DEBUG})
add_library(OpenSceneGraph, osgDB$${LIBRARYVER}$${DEBUG})
add_library(OpenSceneGraph, osgFX$${LIBRARYVER}$${DEBUG})
add_library(OpenSceneGraph, osgGA$${LIBRARYVER}$${DEBUG})
add_library(OpenSceneGraph, osgManipulator$${LIBRARYVER}$${DEBUG})
add_library(OpenSceneGraph, osgParticle$${LIBRARYVER}$${DEBUG})
add_library(OpenSceneGraph, osgPresentation$${LIBRARYVER}$${DEBUG})
add_library(OpenSceneGraph, osgQt$${LIBRARYVER}$${DEBUG})
add_library(OpenSceneGraph, osgShadow$${LIBRARYVER}$${DEBUG})
add_library(OpenSceneGraph, osgSim$${LIBRARYVER}$${DEBUG})
add_library(OpenSceneGraph, osgTerrain$${LIBRARYVER}$${DEBUG})
add_library(OpenSceneGraph, osgText$${LIBRARYVER}$${DEBUG})
add_library(OpenSceneGraph, osgUI$${LIBRARYVER}$${DEBUG})
add_library(OpenSceneGraph, osgUtil$${LIBRARYVER}$${DEBUG})
add_library(OpenSceneGraph, osgViewer$${LIBRARYVER}$${DEBUG})
add_library(OpenSceneGraph, osgVolume$${LIBRARYVER}$${DEBUG})
add_library(OpenSceneGraph, osgWidget$${LIBRARYVER}$${DEBUG})
add_library(OpenThreads$${LIBRARYVER}$${DEBUG})
add_library(osg$${LIBRARYVER}$${DEBUG})
add_library(osgAnimation$${LIBRARYVER}$${DEBUG})
add_library(osgDB$${LIBRARYVER}$${DEBUG})
add_library(osgFX$${LIBRARYVER}$${DEBUG})
add_library(osgGA$${LIBRARYVER}$${DEBUG})
add_library(osgManipulator$${LIBRARYVER}$${DEBUG})
add_library(osgParticle$${LIBRARYVER}$${DEBUG})
add_library(osgPresentation$${LIBRARYVER}$${DEBUG})
add_library(osgQt$${LIBRARYVER}$${DEBUG})
add_library(osgShadow$${LIBRARYVER}$${DEBUG})
add_library(osgSim$${LIBRARYVER}$${DEBUG})
add_library(osgTerrain$${LIBRARYVER}$${DEBUG})
add_library(osgText$${LIBRARYVER}$${DEBUG})
add_library(osgUI$${LIBRARYVER}$${DEBUG})
add_library(osgUtil$${LIBRARYVER}$${DEBUG})
add_library(osgViewer$${LIBRARYVER}$${DEBUG})
add_library(osgVolume$${LIBRARYVER}$${DEBUG})
add_library(osgWidget$${LIBRARYVER}$${DEBUG})
return (1)
}
@ -102,7 +104,8 @@ defineTest(add_link_library_OpenSceneGraph) {
#发布依赖library的函数
#注意Android也需要这个函数，使用这个函数Android才会发布Library到运行时。上边的只是链接作用。
defineTest(add_deploy_library_OpenSceneGraph) {
add_deploy_libraryes(OpenSceneGraph)
add_deploy_libraryes(OpenSceneGraph, , , , "qtversionpath")
add_deploy_library(OpenSceneGraph, osgQt$${LIBRARYVER}$${DEBUG}, , , "qtversionpath", "deployqt")
return (1)
}

7
app-lib/add_library_QQt.pri
View File

@ -497,7 +497,7 @@ defineReplace(get_add_include_path_QQt){
#用户包含QQt头文件，就不必加相对路径了，方便了很多
defineTest(add_include_path_QQt){
#包含QQt头文件的过程
header_path = $$get_add_include_path(QQt)
header_path = $$get_add_include_path(QQt, , , "bundle", "qtversionpath")
INCLUDEPATH += $$get_add_include_path_QQt($$header_path)
export(INCLUDEPATH)
return (1)
@ -506,7 +506,8 @@ defineTest(add_include_path_QQt){
defineTest(add_library_QQt){
#链接QQt
add_library(QQt, QQt$${DEBUG})
add_library_path(QQt, , use, use)
add_library(QQt$${LIBRARYVER}$${DEBUG})
}
#######################################################################################
@ -532,7 +533,7 @@ defineTest(add_link_library_QQt){
#调试，正常；发布运行，正常。
#:) 方便函数
defineTest(add_deploy_library_QQt){
add_deploy_library_Qt(QQt, QQt$${DEBUG})
add_deploy_library(QQt, QQt$${DEBUG}, , use, use, use)
return (1)
}

7
app-lib/add_library_Qwt.pri
View File

@ -31,7 +31,7 @@ defineReplace(get_add_include_path_Qwt){
defineTest(add_include_path_Qwt){
#包含Qwt头文件的过程
header_path = $$get_add_include_path(Qwt)
header_path = $$get_add_include_path(Qwt, , , "use bundle", "use qt version path")
INCLUDEPATH += $$get_add_include_path_Qwt($$header_path)
export(INCLUDEPATH)
return (1)
@ -39,7 +39,8 @@ defineTest(add_include_path_Qwt){
defineTest(add_library_Qwt){
#链接Library
add_library(Qwt, Qwt$${LIBRARYVER}$${DEBUG})
add_library_path(Qwt, , "use bundle", "use qt version path")
add_library(Qwt$${LIBRARYVER}$${DEBUG})
return (1)
}
@ -66,7 +67,7 @@ defineTest(add_link_library_Qwt){
#发布依赖library
#注意Android也需要这个函数，使用这个函数Android才会发布Library到运行时。上边的只是链接作用。
defineTest(add_deploy_library_Qwt) {
add_deploy_library_Qt(Qwt, Qwt$${LIBRARYVER}$${DEBUG})
add_deploy_library(Qwt, Qwt$${DEBUG}, , "use bundle", "use qt version path", "use deploy qt")
return (1)
}

10
app-lib/add_library_QwtPlot3d.pri
View File

@ -31,15 +31,17 @@ defineReplace(get_add_include_path_QwtPlot3d){
defineTest(add_include_path_QwtPlot3d){
#包含QwtPlot3d头文件的过程
header_path = $$get_add_include_path(QwtPlot3d)
header_path = $$get_add_include_path(QwtPlot3d, , , "bundle", "qtversionpath")
INCLUDEPATH += $$get_add_include_path_QwtPlot3d($$header_path)
export(INCLUDEPATH)
return (1)
}
defineTest(add_library_QwtPlot3d){
#链接Library
add_library(QwtPlot3d, QwtPlot3d$${LIBRARYVER}$${DEBUG})
#添加Library路径
add_library_path(QwtPlot3d, , "bundle", "qtversionpath")
#添加这个SDK里的library
add_library(QwtPlot3d$${LIBRARYVER}$${DEBUG})
return (1)
}
@ -66,7 +68,7 @@ defineTest(add_link_library_QwtPlot3d){
#发布依赖library
#注意Android也需要这个函数，使用这个函数Android才会发布Library到运行时。上边的只是链接作用。
defineTest(add_deploy_library_QwtPlot3d) {
add_deploy_library_Qt(QwtPlot3d, QwtPlot3d$${LIBRARYVER}$${DEBUG})
add_deploy_library(QwtPlot3d, QwtPlot3d$${LIBRARYVER}$${DEBUG}, , "bundle", "qtversionpath", "deployqt")
return (1)
}

14
app-lib/add_library_Template.pri
View File

@ -34,7 +34,7 @@ defineReplace(get_add_include_path_Template){
defineTest(add_include_path_Template){
#包含Template头文件的过程
header_path = $$get_add_include_path(Template)
header_path = $$get_add_include_path(Template, , , "bundle", "qtversionpath")
INCLUDEPATH += $$get_add_include_path_Template($$header_path)
export(INCLUDEPATH)
@ -50,10 +50,11 @@ defineTest(add_include_path_Template){
#这个地方add_library_no_bundle代表包括macOS下，都不使用bundle，只是动态库或者静态库。
#修改
defineTest(add_library_Template){
#链接Library
add_library(Template, Template$${LIBRARYVER}$${DEBUG})
#添加这个SDK下的其他的library
#添加Library路径
add_library_path(Template, , "bundle", "qtversionpath")
#添加这个SDK里的library
add_library(Template$${LIBRARYVER}$${DEBUG})
return (1)
}
@ -78,7 +79,8 @@ defineTest(add_link_library_Template){
#_Qt 代表这个lib是基于Qt的 依赖Qt
#留意
defineTest(add_deploy_library_Template) {
add_deploy_library_Qt(Template, Template$${LIBRARYVER}$${DEBUG})
add_deploy_library(Template, Template$${LIBRARYVER}$${DEBUG}, , "bundle", "qtversionpath", "deployqt")
#add_deploy_libraryes(Template, , , "bundle", "qtversionpath")
return (1)
}

2
demo/GuiBuildTool/GuiBuildTool.pro
View File

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

2
demo/LearnCookieTest/LearnCookieTest.pro
View File

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

2
demo/QQtClientCreator/QQtClientCreator.pro
View File

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

2
demo/QQtServerCreator/QQtServerCreator.pro
View File

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

2
demo/QtSdkManager/QtSdkManager.pro
View File

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

2
demo/SysInfoNotify/SysInfoNotify.pro
View File

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

2
demo/VegeTablesPrice/VegeTablesPrice.pro
View File

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

2
demo/soapQQtOnline/soapQQtOnline.pro
View File

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

3
examples/QQtOpenCVExample/QQtOpenCVExample.pro
View File

@ -36,6 +36,7 @@ FORMS += \
CONFIG += mobility
MOBILITY =
system(touch main.cpp)
############################################
#添加所有提供函数的pri 很有美感
############################################
@ -48,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(QQt)
add_deploy_config($$PWD/AppRoot)
#添加其他library

2
examples/QQtOpenSceneGraphExample/QQtOpenSceneGraphExample.pro
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(QQt)
mingw{
#Qt is static, but osg is dynamic
#add_defines(OSG_LIBRARY_STATIC)

2
examples/animationframe/animationframe.pro
View File

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

2
examples/console_app/console_app.pro
View File

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

2
examples/exquisite/exquisite.pro
View File

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

2
examples/qqtaudioexample/qqtaudioexample.pro
View File

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

2
examples/qqtchartexample/qqtchartexample.pro
View File

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

2
examples/qqtclientexample/qqtclientexample.pro
View File

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

2
examples/qqtframe/qqtframe.pro
View File

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

2
examples/qqtframe2/qqtframe2.pro
View File

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

2
examples/qqtnetworkexample/qqtnetworkexample.pro
View File

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

2
examples/qqtserverexample/qqtserverexample.pro
View File

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

2
examples/qqtudpexample/qqtudpexample.pro
View File

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

2
examples/qrcodeexample/qrcodeexample.pro
View File

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

2
examples/tabwidgetexamples/tabwidgetexamples.pro
View File

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

31
multi-link/add_deploy_library.pri
View File

@ -36,7 +36,7 @@ defineReplace(get_add_deploy_library_on_mac) {
libuseqtversion = $$5
libdeployqt = $$6
isEmpty(1): error("get_add_deploy_library_on_mac(libname, librealname, libsubname, libusebundle, libuseqtversion, libdeployqt) requires at least one argument")
!isEmpty(6): error("get_add_deploy_library_on_mac(libname, librealname, libsubname, libusebundle, libuseqtversion, libdeployqt) requires at most six argument")
!isEmpty(7): error("get_add_deploy_library_on_mac(libname, librealname, libsubname, libusebundle, libuseqtversion, libdeployqt) requires at most six argument")
isEmpty(2): librealname = $$libname
isEmpty(3): libsubname =
!isEmpty(4): libusebundle = lib_use_bundle
@ -179,7 +179,7 @@ defineReplace(get_add_deploy_library_on_mac) {
# command += chmod +x $${ADD_DEPLOY_LIBRARY_PRI_PWD}/mac_deploy_qt4.sh &&
# command += $${ADD_DEPLOY_LIBRARY_PRI_PWD}/mac_deploy_qt4.sh $${APP_DEPLOY_PWD}/$${TARGET}.app/Contents/MacOS/$${TARGET}
#}
command += echo app deploy library $$librealname progressed.
command += echo . #app deploy library $$librealname progressed.
#message($$command)
@ -197,7 +197,7 @@ defineReplace(get_add_deploy_library_on_windows) {
libuseqtversion = $$5
libdeployqt = $$6
isEmpty(1): error("get_add_deploy_library_on_windows(libname, librealname, libsubname, libusebundle, libuseqtversion, libdeployqt) requires at least one argument")
!isEmpty(6): error("get_add_deploy_library_on_windows(libname, librealname, libsubname, libusebundle, libuseqtversion, libdeployqt) requires at most six argument")
!isEmpty(7): error("get_add_deploy_library_on_windows(libname, librealname, libsubname, libusebundle, libuseqtversion, libdeployqt) requires at most six argument")
isEmpty(2): librealname = $$libname
isEmpty(3): libsubname =
!isEmpty(4): libusebundle = lib_use_bundle
@ -218,7 +218,7 @@ defineReplace(get_add_deploy_library_on_windows) {
!isEmpty(libdeployqt) {
#经过调试发现，如果DLL引用了Qt库，App却没有引用，windeployqt不会发布那些库，在这里发布。
command += windeployqt $${APP_BUILD_PWD}\\$${librealname}.dll $${DEPLOYTYPE} -verbose=1 $$CMD_SEP
#command += windeployqt $${APP_BUILD_PWD}\\$${librealname}.dll $${DEPLOYTYPE} -verbose=1 $$CMD_SEP
}
command += $$RM $${APP_DEPLOY_PWD}\\*$${librealname}.* $$CMD_SEP
@ -231,7 +231,7 @@ defineReplace(get_add_deploy_library_on_windows) {
command += windeployqt $${APP_DEPLOY_PWD}\\$${librealname}.dll $${DEPLOYTYPE} -verbose=1 $$CMD_SEP
}
command += echo app deploy library $$librealname progressed.
command += echo . #app deploy library $$librealname progressed.
#message($$command)
@ -248,7 +248,7 @@ defineReplace(get_add_deploy_library_on_linux) {
libuseqtversion = $$5
libdeployqt = $$6
isEmpty(1): error("get_add_deploy_library_on_linux(libname, librealname, libsubname, libusebundle, libuseqtversion, libdeployqt) requires at least one argument")
!isEmpty(6): error("get_add_deploy_library_on_linux(libname, librealname, libsubname, libusebundle, libuseqtversion, libdeployqt) requires at most six argument")
!isEmpty(7): error("get_add_deploy_library_on_linux(libname, librealname, libsubname, libusebundle, libuseqtversion, libdeployqt) requires at most six argument")
isEmpty(2): librealname = $$libname
isEmpty(3): libsubname =
!isEmpty(4): libusebundle = lib_use_bundle
@ -277,7 +277,7 @@ defineReplace(get_add_deploy_library_on_android) {
libuseqtversion = $$5
libdeployqt = $$6
isEmpty(1): error("get_add_deploy_library_on_linux(libname, librealname, libsubname, libusebundle, libuseqtversion, libdeployqt) requires at least one argument")
!isEmpty(6): error("get_add_deploy_library_on_linux(libname, librealname, libsubname, libusebundle, libuseqtversion, libdeployqt) requires at most six argument")
!isEmpty(7): error("get_add_deploy_library_on_linux(libname, librealname, libsubname, libusebundle, libuseqtversion, libdeployqt) requires at most six argument")
isEmpty(2): librealname = $$libname
isEmpty(3): libsubname =
!isEmpty(4): libusebundle = lib_use_bundle
@ -315,7 +315,7 @@ defineReplace(get_add_deploy_libraryes_on_mac) {
libuseqtversion = $$5
libdeployqt = $$6
isEmpty(1): error("get_add_deploy_libraryes_on_mac(libname, librealname, libsubname, libusebundle, libuseqtversion, libdeployqt) requires at least one argument")
!isEmpty(6): error("get_add_deploy_libraryes_on_mac(libname, librealname, libsubname, libusebundle, libuseqtversion, libdeployqt) requires at most six argument")
!isEmpty(7): error("get_add_deploy_libraryes_on_mac(libname, librealname, libsubname, libusebundle, libuseqtversion, libdeployqt) requires at most six argument")
isEmpty(2): librealname = $$libname
isEmpty(3): libsubname =
!isEmpty(4): libusebundle = lib_use_bundle
@ -341,7 +341,7 @@ defineReplace(get_add_deploy_libraryes_on_windows) {
libuseqtversion = $$5
libdeployqt = $$6
isEmpty(1): error("get_add_deploy_libraryes_on_windows(libname, librealname, libsubname, libusebundle, libuseqtversion, libdeployqt) requires at least one argument")
!isEmpty(6): error("get_add_deploy_libraryes_on_windows(libname, librealname, libsubname, libusebundle, libuseqtversion, libdeployqt) requires at most six argument")
!isEmpty(7): error("get_add_deploy_libraryes_on_windows(libname, librealname, libsubname, libusebundle, libuseqtversion, libdeployqt) requires at most six argument")
isEmpty(2): librealname = $$libname
isEmpty(3): libsubname =
!isEmpty(4): libusebundle = lib_use_bundle
@ -373,7 +373,7 @@ defineReplace(get_add_deploy_libraryes_on_linux) {
libuseqtversion = $$5
libdeployqt = $$6
isEmpty(1): error("get_add_deploy_libraryes_on_linux(libname, librealname, libsubname, libusebundle, libuseqtversion, libdeployqt) requires at least one argument")
!isEmpty(6): error("get_add_deploy_libraryes_on_linux(libname, librealname, libsubname, libusebundle, libuseqtversion, libdeployqt) requires at most six argument")
!isEmpty(7): error("get_add_deploy_libraryes_on_linux(libname, librealname, libsubname, libusebundle, libuseqtversion, libdeployqt) requires at most six argument")
isEmpty(2): librealname = $$libname
isEmpty(3): libsubname =
!isEmpty(4): libusebundle = lib_use_bundle
@ -400,7 +400,7 @@ defineReplace(get_add_deploy_libraryes_on_android) {
libuseqtversion = $$5
libdeployqt = $$6
isEmpty(1): error("get_add_deploy_libraryes_on_android(libname, librealname, libsubname, libusebundle, libuseqtversion, libdeployqt) requires at least one argument")
!isEmpty(6): error("get_add_deploy_libraryes_on_android(libname, librealname, libsubname, libusebundle, libuseqtversion, libdeployqt) requires at most six argument")
!isEmpty(7): error("get_add_deploy_libraryes_on_android(libname, librealname, libsubname, libusebundle, libuseqtversion, libdeployqt) requires at most six argument")
isEmpty(2): librealname = $$libname
isEmpty(3): libsubname =
!isEmpty(4): libusebundle = lib_use_bundle
@ -437,7 +437,7 @@ defineTest(add_deploy_libraryes) {
libuseqtversion = $$5
libdeployqt = $$6
isEmpty(1): error("add_deploy_library(libname, librealname, libsubname, libusebundle, libuseqtversion, libdeployqt) requires at least one argument")
!isEmpty(6): error("add_deploy_library(libname, librealname, libsubname, libusebundle, libuseqtversion, libdeployqt) requires at most six argument")
!isEmpty(7): error("add_deploy_library(libname, librealname, libsubname, libusebundle, libuseqtversion, libdeployqt) requires at most six argument")
isEmpty(2): librealname =
isEmpty(3): libsubname =
!isEmpty(4): libusebundle = lib_use_bundle
@ -463,7 +463,7 @@ defineTest(add_deploy_libraryes) {
#set app deploy pwd
#APP_DEPLOY_PWD is here.
APP_DEPLOY_PWD = $${APP_DEPLOY_ROOT}/$${TARGET}/$${QSYS_STD_DIR}
APP_DEPLOY_PWD = $${APP_DEPLOY_ROOT}/$${TARGET_PRIVATE}/$${QSYS_STD_DIR}
#不仅仅发布目标为Windows的时候，才需要改变路径
#开发机为Windows就必须改变。
#contains(QKIT_PRIVATE, WIN32||WIN64) {
@ -516,7 +516,7 @@ defineTest(add_deploy_library) {
libuseqtversion = $$5
libdeployqt = $$6
isEmpty(1): error("add_deploy_library(libname, librealname, libsubname, libusebundle, libuseqtversion, libdeployqt) requires at least one argument")
!isEmpty(6): error("add_deploy_library(libname, librealname, libsubname, libusebundle, libuseqtversion, libdeployqt) requires at most six argument")
!isEmpty(7): error("add_deploy_library(libname, librealname, libsubname, libusebundle, libuseqtversion, libdeployqt) requires at most six argument")
isEmpty(2): librealname = $$libname
isEmpty(3): libsubname =
!isEmpty(4): libusebundle = lib_use_bundle
@ -542,8 +542,7 @@ defineTest(add_deploy_library) {
#set app deploy pwd
#APP_DEPLOY_PWD is here.
APP_DEPLOY_PWD =
APP_DEPLOY_PWD = $${APP_DEPLOY_ROOT}/$${TARGET}/$${QSYS_STD_DIR}
APP_DEPLOY_PWD = $${APP_DEPLOY_ROOT}/$${TARGET_PRIVATE}/$${QSYS_STD_DIR}
#不仅仅发布目标为Windows的时候，才需要改变路径
#开发机为Windows就必须改变。
#contains(QKIT_PRIVATE, WIN32||WIN64) {

24
multi-link/add_library.pri
View File

@ -34,8 +34,8 @@ defineReplace(get_add_library_path) {
!isEmpty(4): libuseqtversion = lib_use_qt_version
CUR_LIB_PWD =
isEmpty(4):CUR_LIB_PWD = $${LIB_SDK_ROOT}/$${libname}/$${QSYS_STD_DIR}/lib
else:CUR_LIB_PWD = $${LIB_SDK_ROOT}/$${libname}/$${QSYS_NOQT_STD_DIR}/lib
isEmpty(4):CUR_LIB_PWD = $${LIB_SDK_ROOT}/$${libname}/$${QSYS_NOQT_STD_DIR}/lib
else:CUR_LIB_PWD = $${LIB_SDK_ROOT}/$${libname}/$${QSYS_STD_DIR}/lib
!isEmpty(2):CUR_LIB_PWD=$${CUR_LIB_PWD}/$${librealname}
equals(QMAKE_HOST.os, Windows) {
CUR_LIB_PWD~=s,/,\\,g
@ -194,6 +194,26 @@ defineTest(add_include_path) {
return (1)
}
defineTest(add_library_normal) {
libname = $$1
librealname = $$2
libsubname = $$3
libusebundle = $$4
libuseqtversion = $$5
isEmpty(1): error("add_library_normal(libname, librealname, libsubname, libusebundle, libuseqtversion) requires at least one argument")
!isEmpty(6): error("add_library_normal(libname, librealname, libsubname, libusebundle, libuseqtversion) requires at most four argument")
isEmpty(2): librealname = $$libname
isEmpty(3): libsubname =
!isEmpty(3): libusebundle = lib_use_bundle
!isEmpty(4): libuseqtversion = lib_use_qt_version
add_library_path($$libname, $$libsubname, $$libusebundle, $$libuseqtversion)
add_library($${librealname})
export(LIBS)
return (1)
}
#提供方便
#链接标准SDK
#添加包含路径 libName/.../include

2
test/QQtFMODTest/QQtFMODTest.pro
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(QQt)
add_dependent_manager_FMOD()

2
test/QQtMultiLinkTest/QQtMultiLinkApp/QQtMultiLinkApp.pro
View File

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

2
test/QQtQwtPlot3DTest/QQtQwtPlot3DTest.pro
View File

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

3
test/QQtQwtTest/QQtQwtTest.pro
View File

@ -40,7 +40,6 @@ system(touch main.cpp)
#自定义的不想加到内置里的，就用add_custom_manager.pri
#add_custom_manager也不想用的，就加到自己pro文件里好了。
include (../../multi-link/add_base_manager.pri)
include (../../app-lib/add_dependent_manager.pri)
include (../../app-lib/add_custom_manager.pri)
@ -52,7 +51,7 @@ add_deploy()
#app发布library 只有app才会发布
add_dependent_manager(QQt)
add_dependent_manager_Qwt()
add_dependent_manager(Qwt)
#打印状态
message($$TARGET config $$CONFIG)

2
test/QQtWidgetClickHelperTest/QQtWidgetClickHelperTest.pro
View File

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

2
test/QQtWidgetClickSoundHelperTest/QQtWidgetClickSoundHelperTest.pro
View File

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

2
test/bytearraytest/bytearraytest.pro
View File

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

2
test/cmdwidget/cmdwidget.pro
View File

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

2
test/coretest/coretest.pro
View File

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

2
test/customqvariant/customqvariant.pro
View File

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

2
test/easter/easter.pro
View File

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

2
test/framelesshelperwidget/framelesshelperwidget.pro
View File

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

2
test/giftest/giftest.pro
View File

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

2
test/gumbo_query_test/gumbo_query_test.pro
View File

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

2
test/inputtest/inputtest.pro
View File

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

2
test/openglwidgettest/openglwidgettest.pro
View File

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

2
test/osdtest/osdtest.pro
View File

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

2
test/qqtbtfileserver/qqtbtfileserver.pro
View File

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

2
test/qqtdicttest/qqtdicttest.pro
View File

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

2
test/qqtdicttest2/qqtdicttest2.pro
View File

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

2
test/qqtffmpegplayer/qqtffmpegplayer.pro
View File

@ -34,6 +34,6 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager_QQt()
add_dependent_manager(QQt)
add_dependent_library_FFmpeg()

2
test/qqtliveplayer/qqtliveplayer.pro
View File

@ -41,7 +41,7 @@ add_deploy()
#后发布依赖
#libQQt从sdk到build和deploy
add_dependent_manager_QQt()
add_dependent_manager(QQt)
#添加其他library
#libVLCQt从sdk到build和deploy
add_dependent_library_VLC()

2
test/qqtlog4cpptest/qqtlog4cpptest.pro
View File

@ -45,5 +45,5 @@ add_deploy()
#app链接library lib也会链接
#app发布library 只有app才会发布
add_dependent_manager_QQt()
add_dependent_manager(QQt)
add_dependent_manager_log4cpp()

2
test/qqtwebclient/qqtwebclient.pro
View File

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

2
test/qqtwebkittest/qqtwebkittest.pro
View File

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

2
test/svgtest/svgtest.pro
View File

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

2
test/tmpproj/tmpproj.pro
View File

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

2
test/treeviewtest/treeviewtest.pro
View File

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

2
test/voicetest/voicetest.pro
View File

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