From acf166c913c99e22986a5071406e4c14c4c13497 Mon Sep 17 00:00:00 2001 From: tianduanrui <2407223896@qq.com> Date: Mon, 27 Nov 2017 19:52:13 +0800 Subject: [PATCH] update link QQt logic --- QQt.pro | 125 +++++++++--------- demo/VegeTablesPrice/VegeTablesPrice.pro | 41 +++++- examples/QtSdkManager/QtSdkManager.pro | 57 +++++++- examples/animationframe/animationframe.pro | 81 ++++++++---- examples/exquisite/exquisite.pro | 62 ++++++--- examples/qqtchartexample/qqtchartexample.pro | 41 +++--- examples/qqtframe/qqtframe.pro | 44 ++++-- examples/qqtframe2/app_settings.pri | 2 +- examples/qqtframe2/link_qqt_library.pri | 12 +- examples/qqtframe2/qqtframe2.pro | 33 +---- .../qqtnetworkexample/qqtnetworkexample.pro | 28 +++- examples/qrcodeexample/qrcodeexample.pro | 43 +++--- .../tabwidgetexamples/tabwidgetexamples.pro | 41 +++--- src/qqt.pro | 9 -- src/qqt_header.pri | 9 ++ src/qqt_library.pri | 15 ++- test/cmdwidget/cmdwidget.pro | 42 ++++-- test/coretest/coretest.pro | 54 +++++++- test/coretest/main.cpp | 0 test/easter/easter.pro | 53 ++++++-- .../framelesshelperwidget.pro | 81 ++++++++---- test/gumbo_query_test/gumbo_query_test.pro | 39 ++++-- test/qqtbtfileserver/qqtbtfileserver.pro | 25 +++- test/qqtdicttest/main.cpp | 0 test/qqtdicttest/qqtdicttest.pro | 53 +++++++- test/qqtwebclient/qqtwebclient.pro | 54 +++++++- test/qqtwebkittest/qqtwebkittest.pro | 55 +++++++- test/soapQQtOnline/soapQQtOnline.pro | 68 +++++++--- test/svgtest/svgtest.pro | 39 ++++-- test/treeviewtest/treeviewtest.pro | 40 +++--- 30 files changed, 894 insertions(+), 352 deletions(-) create mode 100644 test/coretest/main.cpp create mode 100644 test/qqtdicttest/main.cpp diff --git a/QQt.pro b/QQt.pro index 0c9f2105..8181576a 100644 --- a/QQt.pro +++ b/QQt.pro @@ -3,67 +3,66 @@ CONFIG += ordered SUBDIRS = src/qqt.pro -##----------------------------------------------------------------- -##basic example -##----------------------------------------------------------------- -#SUBDIRS += examples/qqtframe -#SUBDIRS += examples/qqtframe2 -#SUBDIRS += examples/animationframe -# -##----------------------------------------------------------------- -##QQt installed to Qt library or -##QQt installed to sdk or -##QQt is build -##----------------------------------------------------------------- -#SUBDIRS += examples/exquisite -#SUBDIRS += examples/tabwidgetexamples -#SUBDIRS += examples/qrcodeexample -#SUBDIRS += examples/qqtnetworkexample -#SUBDIRS += examples/qqtchartexample -# -# -##----------------------------------------------------------------- -##need webaccessmanager - WebSupport -##need QSsl -##need GumoQuery -##----------------------------------------------------------------- -#greaterThan(QT_MAJOR_VERSION , 4):SUBDIRS += examples/QtSdkManager -# -greaterThan(QT_MAJOR_VERSION , 4):SUBDIRS += demo/VegeTablesPrice -##----------------------------------------------------------------- -##some test project -##----------------------------------------------------------------- -#SUBDIRS += test/gumbo_query_test -#SUBDIRS += test/svgtest -#SUBDIRS += test/framelesshelperwidget -#SUBDIRS += test/treeviewtest -#SUBDIRS += test/qqtdicttest -#!contains(QKIT_PRIVATE, iOS|iOSSimulator){ -# SUBDIRS += test/cmdwidget -#} -#SUBDIRS += test/coretest -# -##----------------------------------------------------------------- -##need webkit webkitwidgets - WebSupport -##webengine -##----------------------------------------------------------------- -#lessThan(QT_MAJOR_VERSION , 5):SUBDIRS += test/qqtwebkittest -#lessThan(QT_MAJOR_VERSION , 5):SUBDIRS += test/qqtwebclient -##----------------------------------------------------------------- -##need QtSoap - WebSupport -##----------------------------------------------------------------- -#SUBDIRS += test/easter -#SUBDIRS += test/soapQQtOnline -##----------------------------------------------------------------- -##need vlcQt libvlc library -##----------------------------------------------------------------- -##SUBDIRS += test/qqtliveplayer -# -##----------------------------------------------------------------- -##need ffmpeg library -##----------------------------------------------------------------- -##SUBDIRS += test/qqtffmpegplayer -# -##need bluetooth library -#SUBDIRS += test/qqtbtfileserver +#----------------------------------------------------------------- +#basic example +#----------------------------------------------------------------- +SUBDIRS += examples/qqtframe +SUBDIRS += examples/qqtframe2 +SUBDIRS += examples/animationframe + +#----------------------------------------------------------------- +#QQt installed to Qt library or +#QQt installed to sdk or +#QQt is build +#----------------------------------------------------------------- +SUBDIRS += examples/exquisite +SUBDIRS += examples/tabwidgetexamples +SUBDIRS += examples/qrcodeexample +SUBDIRS += examples/qqtnetworkexample +SUBDIRS += examples/qqtchartexample + + +#----------------------------------------------------------------- +#need webaccessmanager - WebSupport +#need QSsl +#need GumoQuery +#----------------------------------------------------------------- +greaterThan(QT_MAJOR_VERSION , 4):SUBDIRS += examples/QtSdkManager +greaterThan(QT_MAJOR_VERSION , 4):SUBDIRS += demo/VegeTablesPrice +#----------------------------------------------------------------- +#some test project +#----------------------------------------------------------------- +SUBDIRS += test/gumbo_query_test +SUBDIRS += test/svgtest +SUBDIRS += test/framelesshelperwidget +SUBDIRS += test/treeviewtest +SUBDIRS += test/qqtdicttest +!contains(QKIT_PRIVATE, iOS|iOSSimulator){ + SUBDIRS += test/cmdwidget +} +SUBDIRS += test/coretest + +#----------------------------------------------------------------- +#need webkit webkitwidgets - WebSupport +#webengine +#----------------------------------------------------------------- +lessThan(QT_MAJOR_VERSION , 5):SUBDIRS += test/qqtwebkittest +lessThan(QT_MAJOR_VERSION , 5):SUBDIRS += test/qqtwebclient +#----------------------------------------------------------------- +#need QtSoap - WebSupport +#----------------------------------------------------------------- +SUBDIRS += test/easter +SUBDIRS += test/soapQQtOnline +#----------------------------------------------------------------- +#need vlcQt libvlc library +#----------------------------------------------------------------- +#SUBDIRS += test/qqtliveplayer + +#----------------------------------------------------------------- +#need ffmpeg library +#----------------------------------------------------------------- +#SUBDIRS += test/qqtffmpegplayer + +#need bluetooth library +SUBDIRS += test/qqtbtfileserver diff --git a/demo/VegeTablesPrice/VegeTablesPrice.pro b/demo/VegeTablesPrice/VegeTablesPrice.pro index f2a7441c..25eb33f4 100644 --- a/demo/VegeTablesPrice/VegeTablesPrice.pro +++ b/demo/VegeTablesPrice/VegeTablesPrice.pro @@ -33,7 +33,7 @@ FORMS += \ mainwindow.ui -#debug. +#qmake_pre/post_link will work after source changed but not pro pri changed. system("touch main.cpp") #------------------------------------------------- @@ -46,5 +46,42 @@ include(../../examples/qqtframe2/link_qqt_library.pri) #------------------------------------------------- #user app may use these these settings prefertly #------------------------------------------------- -include(../../examples/qqtframe2/app_settings.pri) +#------------------------------------------------- +#install app +#------------------------------------------------- +#CONFIG += can_install +can_install:equals(QKIT_PRIVATE, EMBEDDED) { + target.path = /Application + INSTALLS += target +} else: unix { + equals(QKIT_PRIVATE, macOS) { + target.path = /Applications + INSTALLS += target + } +} + +############ +##config defination +############ +equals(QKIT_PRIVATE, macOS) { + CONFIG += app_bundle +} + +contains(QKIT_PRIVATE, ANDROID|ANDROIDX86) { + CONFIG += mobility + MOBILITY = + DISTFILES += \ + android/AndroidManifest.xml + + ANDROID_PACKAGE_SOURCE_DIR = $${PWD}/android +} + + +#------------------------------------------------- +##project environ +#------------------------------------------------- +#default +message ($${TARGET} config $${CONFIG}) +message ($${TARGET} define $${DEFINES}) + diff --git a/examples/QtSdkManager/QtSdkManager.pro b/examples/QtSdkManager/QtSdkManager.pro index 50cb0e16..9076b5af 100644 --- a/examples/QtSdkManager/QtSdkManager.pro +++ b/examples/QtSdkManager/QtSdkManager.pro @@ -22,10 +22,6 @@ greaterThan(QT_MAJOR_VERSION, 4): DEFINES += __QT5__ TARGET = QQtSdkManager TEMPLATE = app -include(../qqtframe2/link_qqt_library.pri) - - - INCLUDEPATH += $$PWD SOURCES += \ @@ -46,3 +42,56 @@ HEADERS += \ FORMS += \ mainwindow.ui \ httpdownloaddialog.ui + +#qmake_pre/post_link will work after source changed but not pro pri changed. +system("touch main.cpp") + +#------------------------------------------------- +#link qqt library +#if you link a library to your app, on android you must select the running kit to the app, not LibQQt e.g. +#user can modify any infomation under this annotation +#------------------------------------------------- +include(../../examples/qqtframe2/link_qqt_library.pri) + +#------------------------------------------------- +#user app may use these these settings prefertly +#------------------------------------------------- +#------------------------------------------------- +#install app +#------------------------------------------------- +#CONFIG += can_install +can_install:equals(QKIT_PRIVATE, EMBEDDED) { + target.path = /Application + INSTALLS += target +} else: unix { + equals(QKIT_PRIVATE, macOS) { + target.path = /Applications + INSTALLS += target + } +} + +############ +##config defination +############ +equals(QKIT_PRIVATE, macOS) { + CONFIG += app_bundle +} + +contains(QKIT_PRIVATE, ANDROID|ANDROIDX86) { + CONFIG += mobility + MOBILITY = + DISTFILES += \ + android/AndroidManifest.xml + + ANDROID_PACKAGE_SOURCE_DIR = $${PWD}/android +} + + +#------------------------------------------------- +##project environ +#------------------------------------------------- +#default +message ($${TARGET} config $${CONFIG}) +message ($${TARGET} define $${DEFINES}) + + diff --git a/examples/animationframe/animationframe.pro b/examples/animationframe/animationframe.pro index 704df083..0a6482a0 100644 --- a/examples/animationframe/animationframe.pro +++ b/examples/animationframe/animationframe.pro @@ -3,34 +3,6 @@ # Project created by QtCreator 2016-06-17T10:03:52 # #------------------------------------------------- -include(../qqtframe2/link_qqt_library.pri) - -############ -##install -############ -#CONFIG += can_install -can_install:equals(QKIT_PRIVATE, EMBEDDED) { - target.path = /Application - INSTALLS += target -} else: unix { - equals(QKIT_PRIVATE, macOS) { - target.path = /Applications - INSTALLS += target - } -} - -equals(QKIT_PRIVATE, ANDROID) { - CONFIG += mobility - MOBILITY = -} - -################################################################# -##project environ -################################################################# -#default -message ($${TARGET} config $${CONFIG}) -message ($${TARGET} define $${DEFINES}) - QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets @@ -47,3 +19,56 @@ HEADERS += $$PWD/qqtapp.h $$PWD/qqtwindow.h \ animationmanager.h FORMS += $$PWD/qqtwindow.ui + +#qmake_pre/post_link will work after source changed but not pro pri changed. +system("touch main.cpp") + +#------------------------------------------------- +#link qqt library +#if you link a library to your app, on android you must select the running kit to the app, not LibQQt e.g. +#user can modify any infomation under this annotation +#------------------------------------------------- +include(../qqtframe2/link_qqt_library.pri) + +#------------------------------------------------- +#user app may use these these settings prefertly +#------------------------------------------------- +#------------------------------------------------- +#install app +#------------------------------------------------- +#CONFIG += can_install +can_install:equals(QKIT_PRIVATE, EMBEDDED) { + target.path = /Application + INSTALLS += target +} else: unix { + equals(QKIT_PRIVATE, macOS) { + target.path = /Applications + INSTALLS += target + } +} + +############ +##config defination +############ +equals(QKIT_PRIVATE, macOS) { + CONFIG += app_bundle +} + +contains(QKIT_PRIVATE, ANDROID|ANDROIDX86) { + CONFIG += mobility + MOBILITY = + DISTFILES += \ + android/AndroidManifest.xml + + ANDROID_PACKAGE_SOURCE_DIR = $${PWD}/android +} + + +#------------------------------------------------- +##project environ +#------------------------------------------------- +#default +message ($${TARGET} config $${CONFIG}) +message ($${TARGET} define $${DEFINES}) + + diff --git a/examples/exquisite/exquisite.pro b/examples/exquisite/exquisite.pro index ecdd819f..d37fe254 100644 --- a/examples/exquisite/exquisite.pro +++ b/examples/exquisite/exquisite.pro @@ -21,13 +21,6 @@ DEFINES += QT_DEPRECATED_WARNINGS # You can also select to disable deprecated APIs only up to a certain version of Qt. #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 -equals(QKIT_PRIVATE, macOS) { - QMAKE_PRE_LINK += echo hello - QMAKE_PRE_LINK += rm -rf bin/exquisite.app -} - -system(touch main.cpp) - SOURCES += \ main.cpp \ mainwindow.cpp @@ -38,14 +31,37 @@ HEADERS += \ FORMS += \ mainwindow.ui + +#qmake_pre/post_link will work after source changed but not pro pri changed. +system("touch main.cpp") + +################################################################ +##build cache +################################################################ +OBJECTS_DIR = obj +MOC_DIR = obj/moc.cpp +UI_DIR = obj/ui.h +RCC_DIR = qrc +#user can change this dir +DESTDIR = bin + +equals(QKIT_PRIVATE, macOS) { + QMAKE_PRE_LINK += echo hello + QMAKE_PRE_LINK += rm -rf $${DESTDIR}/$${TARGET}.app +} + #------------------------------------------------- #link qqt library #if you link a library to your app, on android you must select the running kit to the app, not LibQQt e.g. +#user can modify any infomation under this annotation #------------------------------------------------- include(../qqtframe2/link_qqt_library.pri) #------------------------------------------------- -#install +#user app may use these these settings prefertly +#------------------------------------------------- +#------------------------------------------------- +#install app #------------------------------------------------- #CONFIG += can_install can_install:equals(QKIT_PRIVATE, EMBEDDED) { @@ -58,6 +74,22 @@ can_install:equals(QKIT_PRIVATE, EMBEDDED) { } } +############ +##config defination +############ +equals(QKIT_PRIVATE, macOS) { + CONFIG += app_bundle +} + +contains(QKIT_PRIVATE, ANDROID|ANDROIDX86) { + CONFIG += mobility + MOBILITY = + DISTFILES += \ + $${PWD}/android/AndroidManifest.xml + + ANDROID_PACKAGE_SOURCE_DIR = $${PWD}/android +} + #------------------------------------------------- ##project environ #------------------------------------------------- @@ -65,18 +97,4 @@ can_install:equals(QKIT_PRIVATE, EMBEDDED) { message ($${TARGET} config $${CONFIG}) message ($${TARGET} define $${DEFINES}) -contains(QKIT_PRIVATE, ANDROID|ANDROIDX86) { - CONFIG += mobility - MOBILITY = - DISTFILES += \ - android/AndroidManifest.xml \ - android/gradle/wrapper/gradle-wrapper.jar \ - android/gradlew \ - android/res/values/libs.xml \ - android/build.gradle \ - android/gradle/wrapper/gradle-wrapper.properties \ - android/gradlew.bat - - ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android -} diff --git a/examples/qqtchartexample/qqtchartexample.pro b/examples/qqtchartexample/qqtchartexample.pro index afd532e3..c9221739 100644 --- a/examples/qqtchartexample/qqtchartexample.pro +++ b/examples/qqtchartexample/qqtchartexample.pro @@ -36,14 +36,21 @@ FORMS += \ CONFIG += mobility MOBILITY = +#qmake_pre/post_link will work after source changed but not pro pri changed. +system("touch main.cpp") + #------------------------------------------------- #link qqt library #if you link a library to your app, on android you must select the running kit to the app, not LibQQt e.g. +#user can modify any infomation under this annotation #------------------------------------------------- -include(../qqtframe2/link_qqt_library.pri) +include(../../examples/qqtframe2/link_qqt_library.pri) #------------------------------------------------- -#install +#user app may use these these settings prefertly +#------------------------------------------------- +#------------------------------------------------- +#install app #------------------------------------------------- #CONFIG += can_install can_install:equals(QKIT_PRIVATE, EMBEDDED) { @@ -56,6 +63,23 @@ can_install:equals(QKIT_PRIVATE, EMBEDDED) { } } +############ +##config defination +############ +equals(QKIT_PRIVATE, macOS) { + CONFIG += app_bundle +} + +contains(QKIT_PRIVATE, ANDROID|ANDROIDX86) { + CONFIG += mobility + MOBILITY = + DISTFILES += \ + android/AndroidManifest.xml + + ANDROID_PACKAGE_SOURCE_DIR = $${PWD}/android +} + + #------------------------------------------------- ##project environ #------------------------------------------------- @@ -63,17 +87,4 @@ can_install:equals(QKIT_PRIVATE, EMBEDDED) { message ($${TARGET} config $${CONFIG}) message ($${TARGET} define $${DEFINES}) -contains(QKIT_PRIVATE, ANDROID|ANDROIDX86) { - CONFIG += mobility - MOBILITY = - DISTFILES += \ - android/AndroidManifest.xml \ - android/gradle/wrapper/gradle-wrapper.jar \ - android/gradlew \ - android/res/values/libs.xml \ - android/build.gradle \ - android/gradle/wrapper/gradle-wrapper.properties \ - android/gradlew.bat - ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android -} diff --git a/examples/qqtframe/qqtframe.pro b/examples/qqtframe/qqtframe.pro index 549f17eb..ef88795b 100644 --- a/examples/qqtframe/qqtframe.pro +++ b/examples/qqtframe/qqtframe.pro @@ -3,7 +3,6 @@ # Project created by QtCreator 2016-06-17T10:03:52 # #------------------------------------------------- - QT += core gui network sql xml greaterThan(QT_MAJOR_VERSION, 4): QT += widgets @@ -18,11 +17,22 @@ HEADERS += $$PWD/qqtapp.h $$PWD/qqtwindow.h FORMS += $$PWD/qqtwindow.ui -include(../qqtframe2/link_qqt_library.pri) +#qmake_pre/post_link will work after source changed but not pro pri changed. +system("touch main.cpp") -############ -##install -############ +#------------------------------------------------- +#link qqt library +#if you link a library to your app, on android you must select the running kit to the app, not LibQQt e.g. +#user can modify any infomation under this annotation +#------------------------------------------------- +include(../../examples/qqtframe2/link_qqt_library.pri) + +#------------------------------------------------- +#user app may use these these settings prefertly +#------------------------------------------------- +#------------------------------------------------- +#install app +#------------------------------------------------- #CONFIG += can_install can_install:equals(QKIT_PRIVATE, EMBEDDED) { target.path = /Application @@ -34,14 +44,28 @@ can_install:equals(QKIT_PRIVATE, EMBEDDED) { } } -equals(QKIT_PRIVATE, ANDROID) { - CONFIG += mobility - MOBILITY = +############ +##config defination +############ +equals(QKIT_PRIVATE, macOS) { + CONFIG += app_bundle } -################################################################# +contains(QKIT_PRIVATE, ANDROID|ANDROIDX86) { + CONFIG += mobility + MOBILITY = + DISTFILES += \ + android/AndroidManifest.xml + + ANDROID_PACKAGE_SOURCE_DIR = $${PWD}/android +} + + +#------------------------------------------------- ##project environ -################################################################# +#------------------------------------------------- #default message ($${TARGET} config $${CONFIG}) message ($${TARGET} define $${DEFINES}) + + diff --git a/examples/qqtframe2/app_settings.pri b/examples/qqtframe2/app_settings.pri index 080b3383..6c8917be 100644 --- a/examples/qqtframe2/app_settings.pri +++ b/examples/qqtframe2/app_settings.pri @@ -25,7 +25,7 @@ contains(QKIT_PRIVATE, ANDROID|ANDROIDX86) { DISTFILES += \ android/AndroidManifest.xml - ANDROID_PACKAGE_SOURCE_DIR = android + ANDROID_PACKAGE_SOURCE_DIR = $${PWD}/android } ################################################################ diff --git a/examples/qqtframe2/link_qqt_library.pri b/examples/qqtframe2/link_qqt_library.pri index 70193b89..51be2d78 100644 --- a/examples/qqtframe2/link_qqt_library.pri +++ b/examples/qqtframe2/link_qqt_library.pri @@ -49,12 +49,6 @@ equals(QMAKE_HOST.os, Darwin) { #all cross platform setting is from here. include($${QQT_SOURCE_ROOT}/src/qqt_qkit.pri) -#if you dont modify Qt Creator default build directory, you may need mod this path variable. -#link operation all will need this variable -QQT_STD_DIR = QQt/$${QT_VERSION}/$${SYSNAME}/$${BUILD} -#link from build need this -QQT_DST_DIR = src/bin - #qqt version include($${QQT_SOURCE_ROOT}/src/qqt_version.pri) @@ -64,6 +58,12 @@ include($${QQT_SOURCE_ROOT}/src/qqt_header.pri) #------------------------------------------------------------- #link qqt settings: use source or link library? #------------------------------------------------------------- +#if you dont modify Qt Creator default build directory, you may need mod this path variable. +#link operation all will need this variable +QQT_STD_DIR = QQt/$${QT_VERSION}/$${SYSNAME}/$${BUILD} +#link from build need this, if you mod DESTDIR, you will need modify this +QQT_DST_DIR = src/bin + #if you want to build qqt source open this annotation #CONFIG += LINK_QQT_SOURCE contains (CONFIG, LINK_QQT_SOURCE) { diff --git a/examples/qqtframe2/qqtframe2.pro b/examples/qqtframe2/qqtframe2.pro index 7864b598..a43010a8 100644 --- a/examples/qqtframe2/qqtframe2.pro +++ b/examples/qqtframe2/qqtframe2.pro @@ -13,35 +13,6 @@ DEFINES += QT_DEPRECATED_WARNINGS # In order to do so, uncomment the following line. # You can also select to disable deprecated APIs only up to a certain version of Qt. #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 - -include(../qqtframe2/link_qqt_library.pri) - -############ -##install -############ -#CONFIG += can_install -can_install:equals(QKIT_PRIVATE, EMBEDDED) { - target.path = /Application - INSTALLS += target -} else: unix { - equals(QKIT_PRIVATE, macOS) { - target.path = /Applications - INSTALLS += target - } -} - -equals(QKIT_PRIVATE, ANDROID) { - CONFIG += mobility - MOBILITY = -} - -################################################################# -##project environ -################################################################# -#default -message ($${TARGET} config $${CONFIG}) -message ($${TARGET} define $${DEFINES}) - TARGET = qqtframe2 TEMPLATE = app @@ -54,3 +25,7 @@ HEADERS += \ FORMS += \ mainwindow.ui + + +include(../qqtframe2/link_qqt_library.pri) +include(../qqtframe2/app_settings.pri) diff --git a/examples/qqtnetworkexample/qqtnetworkexample.pro b/examples/qqtnetworkexample/qqtnetworkexample.pro index 2663e46d..ff066243 100644 --- a/examples/qqtnetworkexample/qqtnetworkexample.pro +++ b/examples/qqtnetworkexample/qqtnetworkexample.pro @@ -50,16 +50,21 @@ contains (DEFINES, __BLUETOOTH__){ FORMS += \ mainwindow.ui -CONFIG += mobility -MOBILITY = +#qmake_pre/post_link will work after source changed but not pro pri changed. +system("touch main.cpp") #------------------------------------------------- #link qqt library +#if you link a library to your app, on android you must select the running kit to the app, not LibQQt e.g. +#user can modify any infomation under this annotation #------------------------------------------------- -include(../qqtframe2/link_qqt_library.pri) +include(../../examples/qqtframe2/link_qqt_library.pri) #------------------------------------------------- -#install +#user app may use these these settings prefertly +#------------------------------------------------- +#------------------------------------------------- +#install app #------------------------------------------------- #CONFIG += can_install can_install:equals(QKIT_PRIVATE, EMBEDDED) { @@ -72,11 +77,23 @@ can_install:equals(QKIT_PRIVATE, EMBEDDED) { } } -equals(QKIT_PRIVATE, ANDROID) { +############ +##config defination +############ +equals(QKIT_PRIVATE, macOS) { + CONFIG += app_bundle +} + +contains(QKIT_PRIVATE, ANDROID|ANDROIDX86) { CONFIG += mobility MOBILITY = + DISTFILES += \ + android/AndroidManifest.xml + + ANDROID_PACKAGE_SOURCE_DIR = $${PWD}/android } + #------------------------------------------------- ##project environ #------------------------------------------------- @@ -84,3 +101,4 @@ equals(QKIT_PRIVATE, ANDROID) { message ($${TARGET} config $${CONFIG}) message ($${TARGET} define $${DEFINES}) + diff --git a/examples/qrcodeexample/qrcodeexample.pro b/examples/qrcodeexample/qrcodeexample.pro index bea046db..c44d5e09 100644 --- a/examples/qrcodeexample/qrcodeexample.pro +++ b/examples/qrcodeexample/qrcodeexample.pro @@ -35,18 +35,21 @@ HEADERS += \ FORMS += \ mainwindow.ui -CONFIG += mobility -MOBILITY = - +#qmake_pre/post_link will work after source changed but not pro pri changed. +system("touch main.cpp") #------------------------------------------------- #link qqt library #if you link a library to your app, on android you must select the running kit to the app, not LibQQt e.g. +#user can modify any infomation under this annotation #------------------------------------------------- -include(../qqtframe2/link_qqt_library.pri) +include(../../examples/qqtframe2/link_qqt_library.pri) #------------------------------------------------- -#install +#user app may use these these settings prefertly +#------------------------------------------------- +#------------------------------------------------- +#install app #------------------------------------------------- #CONFIG += can_install can_install:equals(QKIT_PRIVATE, EMBEDDED) { @@ -59,6 +62,23 @@ can_install:equals(QKIT_PRIVATE, EMBEDDED) { } } +############ +##config defination +############ +equals(QKIT_PRIVATE, macOS) { + CONFIG += app_bundle +} + +contains(QKIT_PRIVATE, ANDROID|ANDROIDX86) { + CONFIG += mobility + MOBILITY = + DISTFILES += \ + android/AndroidManifest.xml + + ANDROID_PACKAGE_SOURCE_DIR = $${PWD}/android +} + + #------------------------------------------------- ##project environ #------------------------------------------------- @@ -66,17 +86,4 @@ can_install:equals(QKIT_PRIVATE, EMBEDDED) { message ($${TARGET} config $${CONFIG}) message ($${TARGET} define $${DEFINES}) -contains(QKIT_PRIVATE, ANDROID|ANDROIDX86) { - CONFIG += mobility - MOBILITY = - DISTFILES += \ - android/AndroidManifest.xml \ - android/gradle/wrapper/gradle-wrapper.jar \ - android/gradlew \ - android/res/values/libs.xml \ - android/build.gradle \ - android/gradle/wrapper/gradle-wrapper.properties \ - android/gradlew.bat - ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android -} diff --git a/examples/tabwidgetexamples/tabwidgetexamples.pro b/examples/tabwidgetexamples/tabwidgetexamples.pro index 6db6426d..6e0dd4b3 100644 --- a/examples/tabwidgetexamples/tabwidgetexamples.pro +++ b/examples/tabwidgetexamples/tabwidgetexamples.pro @@ -36,14 +36,21 @@ FORMS += \ CONFIG += mobility MOBILITY = +#qmake_pre/post_link will work after source changed but not pro pri changed. +system("touch main.cpp") + #------------------------------------------------- #link qqt library #if you link a library to your app, on android you must select the running kit to the app, not LibQQt e.g. +#user can modify any infomation under this annotation #------------------------------------------------- -include(../qqtframe2/link_qqt_library.pri) +include(../../examples/qqtframe2/link_qqt_library.pri) #------------------------------------------------- -#install +#user app may use these these settings prefertly +#------------------------------------------------- +#------------------------------------------------- +#install app #------------------------------------------------- #CONFIG += can_install can_install:equals(QKIT_PRIVATE, EMBEDDED) { @@ -56,6 +63,23 @@ can_install:equals(QKIT_PRIVATE, EMBEDDED) { } } +############ +##config defination +############ +equals(QKIT_PRIVATE, macOS) { + CONFIG += app_bundle +} + +contains(QKIT_PRIVATE, ANDROID|ANDROIDX86) { + CONFIG += mobility + MOBILITY = + DISTFILES += \ + android/AndroidManifest.xml + + ANDROID_PACKAGE_SOURCE_DIR = $${PWD}/android +} + + #------------------------------------------------- ##project environ #------------------------------------------------- @@ -63,17 +87,4 @@ can_install:equals(QKIT_PRIVATE, EMBEDDED) { message ($${TARGET} config $${CONFIG}) message ($${TARGET} define $${DEFINES}) -contains(QKIT_PRIVATE, ANDROID|ANDROIDX86) { - CONFIG += mobility - MOBILITY = - DISTFILES += \ - android/AndroidManifest.xml \ - android/gradle/wrapper/gradle-wrapper.jar \ - android/gradlew \ - android/res/values/libs.xml \ - android/build.gradle \ - android/gradle/wrapper/gradle-wrapper.properties \ - android/gradlew.bat - ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android -} diff --git a/src/qqt.pro b/src/qqt.pro index bc811d4f..95fb9c89 100644 --- a/src/qqt.pro +++ b/src/qqt.pro @@ -111,15 +111,6 @@ win32 { RESOURCES += \ qqt.qrc -################################################################ -##build cache -################################################################ -OBJECTS_DIR = obj -MOC_DIR = obj/moc.cpp -UI_DIR = obj/ui.h -RCC_DIR = qrc -DESTDIR = bin - ################################################################# ##project environ diff --git a/src/qqt_header.pri b/src/qqt_header.pri index a96deb6a..06efaaaf 100644 --- a/src/qqt_header.pri +++ b/src/qqt_header.pri @@ -78,6 +78,15 @@ contains(QKIT_PRIVATE, WIN32) { } } +################################################################ +##build cache +################################################################ +isEmpty(OBJECTS_DIR):OBJECTS_DIR = obj +isEmpty(MOC_DIR):MOC_DIR = obj/moc.cpp +isEmpty(UI_DIR):UI_DIR = obj/ui.h +isEmpty(RCC_DIR):RCC_DIR = qrc +isEmpty(DESTDIR):DESTDIR = bin + ################################################################ ##QQt Functions Macro ################################################################ diff --git a/src/qqt_library.pri b/src/qqt_library.pri index 7dc92b02..1f206780 100644 --- a/src/qqt_library.pri +++ b/src/qqt_library.pri @@ -47,19 +47,20 @@ defineReplace(link_qqt_library) { defineReplace(copy_qqt_on_mac) { #need QQT_BUILD_PWD create_command = $$create_mac_sdk() - - command += rm -rf bin/$${TARGET}.app/Contents/Frameworks/QQt.framework && - command += mkdir -p bin/$${TARGET}.app/Contents/Frameworks/QQt.framework && - command += cd bin/$${TARGET}.app/Contents/Frameworks/QQt.framework && + QQT_DESTDIR=$${DESTDIR} + isEmpty(QQT_DESTDIR):QQT_DESTDIR=. + command += rm -rf $${QQT_DESTDIR}/$${TARGET}.app/Contents/Frameworks/QQt.framework && + command += mkdir -p $${QQT_DESTDIR}/$${TARGET}.app/Contents/Frameworks/QQt.framework && + command += cd $${QQT_DESTDIR}/$${TARGET}.app/Contents/Frameworks/QQt.framework && command += $${create_command} && command += cd $${OUT_PWD} && #Qt Creator create framework but use absolute path to make link #QMAKE_POST_LINK += cp -rf $${QQT_LIB_PWD}/QQt.framework \ - # bin/$${TARGET}.app/Contents/Frameworks && + # $${DESTDIR}/$${TARGET}.app/Contents/Frameworks && command += install_name_tool -change QQt.framework/Versions/$${QQT_MAJOR_VERSION}/QQt \ @rpath/QQt.framework/Versions/$${QQT_MAJOR_VERSION}/QQt \ - bin/$${TARGET}.app/Contents/MacOS/$${TARGET} && - command += macdeployqt bin/$${TARGET}.app -verbose=1 + $${QQT_DESTDIR}/$${TARGET}.app/Contents/MacOS/$${TARGET} && + command += macdeployqt $${QQT_DESTDIR}/$${TARGET}.app -verbose=1 #message($$command) return ($$command) } diff --git a/test/cmdwidget/cmdwidget.pro b/test/cmdwidget/cmdwidget.pro index 4bb7fb78..5025e16e 100644 --- a/test/cmdwidget/cmdwidget.pro +++ b/test/cmdwidget/cmdwidget.pro @@ -20,11 +20,22 @@ HEADERS += cmdwidget.h \ FORMS += cmdwidget.ui -include($$PWD/../../examples/qqtframe2/link_qqt_library.pri) +#qmake_pre/post_link will work after source changed but not pro pri changed. +system("touch main.cpp") -############ -##install -############ +#------------------------------------------------- +#link qqt library +#if you link a library to your app, on android you must select the running kit to the app, not LibQQt e.g. +#user can modify any infomation under this annotation +#------------------------------------------------- +include(../../examples/qqtframe2/link_qqt_library.pri) + +#------------------------------------------------- +#user app may use these these settings prefertly +#------------------------------------------------- +#------------------------------------------------- +#install app +#------------------------------------------------- #CONFIG += can_install can_install:equals(QKIT_PRIVATE, EMBEDDED) { target.path = /Application @@ -36,15 +47,28 @@ can_install:equals(QKIT_PRIVATE, EMBEDDED) { } } -equals(QKIT_PRIVATE, ANDROID) { - CONFIG += mobility - MOBILITY = +############ +##config defination +############ +equals(QKIT_PRIVATE, macOS) { + CONFIG += app_bundle } -################################################################# +contains(QKIT_PRIVATE, ANDROID|ANDROIDX86) { + CONFIG += mobility + MOBILITY = + DISTFILES += \ + android/AndroidManifest.xml + + ANDROID_PACKAGE_SOURCE_DIR = $${PWD}/android +} + + +#------------------------------------------------- ##project environ -################################################################# +#------------------------------------------------- #default message ($${TARGET} config $${CONFIG}) message ($${TARGET} define $${DEFINES}) + diff --git a/test/coretest/coretest.pro b/test/coretest/coretest.pro index 179cdbe0..ec1cbc12 100644 --- a/test/coretest/coretest.pro +++ b/test/coretest/coretest.pro @@ -32,4 +32,56 @@ SOURCES += \ DEFINES += SRCDIR=\\\"$$PWD/\\\" -include (../../examples/qqtframe2/link_qqt_library.pri) + +#qmake_pre/post_link will work after source changed but not pro pri changed. +system("touch main.cpp") + +#------------------------------------------------- +#link qqt library +#if you link a library to your app, on android you must select the running kit to the app, not LibQQt e.g. +#user can modify any infomation under this annotation +#------------------------------------------------- +include(../../examples/qqtframe2/link_qqt_library.pri) + +#------------------------------------------------- +#user app may use these these settings prefertly +#------------------------------------------------- +#------------------------------------------------- +#install app +#------------------------------------------------- +#CONFIG += can_install +can_install:equals(QKIT_PRIVATE, EMBEDDED) { + target.path = /Application + INSTALLS += target +} else: unix { + equals(QKIT_PRIVATE, macOS) { + target.path = /Applications + INSTALLS += target + } +} + +############ +##config defination +############ +equals(QKIT_PRIVATE, macOS) { + CONFIG += app_bundle +} + +contains(QKIT_PRIVATE, ANDROID|ANDROIDX86) { + CONFIG += mobility + MOBILITY = + DISTFILES += \ + android/AndroidManifest.xml + + ANDROID_PACKAGE_SOURCE_DIR = $${PWD}/android +} + + +#------------------------------------------------- +##project environ +#------------------------------------------------- +#default +message ($${TARGET} config $${CONFIG}) +message ($${TARGET} define $${DEFINES}) + + diff --git a/test/coretest/main.cpp b/test/coretest/main.cpp new file mode 100644 index 00000000..e69de29b diff --git a/test/easter/easter.pro b/test/easter/easter.pro index 046019b4..fe274253 100644 --- a/test/easter/easter.pro +++ b/test/easter/easter.pro @@ -1,8 +1,27 @@ +TEMPLATE = app +INCLUDEPATH += . +CONFIG += console + +# Input +HEADERS += easter.h +SOURCES += main.cpp easter.cpp + +#qmake_pre/post_link will work after source changed but not pro pri changed. +system("touch main.cpp") + +#------------------------------------------------- +#link qqt library +#if you link a library to your app, on android you must select the running kit to the app, not LibQQt e.g. +#user can modify any infomation under this annotation +#------------------------------------------------- include(../../examples/qqtframe2/link_qqt_library.pri) -############ -##install -############ +#------------------------------------------------- +#user app may use these these settings prefertly +#------------------------------------------------- +#------------------------------------------------- +#install app +#------------------------------------------------- #CONFIG += can_install can_install:equals(QKIT_PRIVATE, EMBEDDED) { target.path = /Application @@ -14,22 +33,28 @@ can_install:equals(QKIT_PRIVATE, EMBEDDED) { } } -equals(QKIT_PRIVATE, ANDROID) { - CONFIG += mobility - MOBILITY = +############ +##config defination +############ +equals(QKIT_PRIVATE, macOS) { + CONFIG += app_bundle } -################################################################# +contains(QKIT_PRIVATE, ANDROID|ANDROIDX86) { + CONFIG += mobility + MOBILITY = + DISTFILES += \ + android/AndroidManifest.xml + + ANDROID_PACKAGE_SOURCE_DIR = $${PWD}/android +} + + +#------------------------------------------------- ##project environ -################################################################# +#------------------------------------------------- #default message ($${TARGET} config $${CONFIG}) message ($${TARGET} define $${DEFINES}) -TEMPLATE = app -INCLUDEPATH += . -CONFIG += console -# Input -HEADERS += easter.h -SOURCES += main.cpp easter.cpp diff --git a/test/framelesshelperwidget/framelesshelperwidget.pro b/test/framelesshelperwidget/framelesshelperwidget.pro index dd61c265..8541b828 100644 --- a/test/framelesshelperwidget/framelesshelperwidget.pro +++ b/test/framelesshelperwidget/framelesshelperwidget.pro @@ -3,34 +3,6 @@ # Project created by QtCreator 2017-10-21T21:26:55 # #------------------------------------------------- -include(../../examples/qqtframe2/link_qqt_library.pri) - -############ -##install -############ -#CONFIG += can_install -can_install:equals(QKIT_PRIVATE, EMBEDDED) { - target.path = /Application - INSTALLS += target -} else: unix { - equals(QKIT_PRIVATE, macOS) { - target.path = /Applications - INSTALLS += target - } -} - -equals(QKIT_PRIVATE, ANDROID) { - CONFIG += mobility - MOBILITY = -} - -################################################################# -##project environ -################################################################# -#default -message ($${TARGET} config $${CONFIG}) -message ($${TARGET} define $${DEFINES}) - QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets @@ -59,3 +31,56 @@ HEADERS += \ FORMS += \ widget.ui + +#qmake_pre/post_link will work after source changed but not pro pri changed. +system("touch main.cpp") + +#------------------------------------------------- +#link qqt library +#if you link a library to your app, on android you must select the running kit to the app, not LibQQt e.g. +#user can modify any infomation under this annotation +#------------------------------------------------- +include(../../examples/qqtframe2/link_qqt_library.pri) + +#------------------------------------------------- +#user app may use these these settings prefertly +#------------------------------------------------- +#------------------------------------------------- +#install app +#------------------------------------------------- +#CONFIG += can_install +can_install:equals(QKIT_PRIVATE, EMBEDDED) { + target.path = /Application + INSTALLS += target +} else: unix { + equals(QKIT_PRIVATE, macOS) { + target.path = /Applications + INSTALLS += target + } +} + +############ +##config defination +############ +equals(QKIT_PRIVATE, macOS) { + CONFIG += app_bundle +} + +contains(QKIT_PRIVATE, ANDROID|ANDROIDX86) { + CONFIG += mobility + MOBILITY = + DISTFILES += \ + android/AndroidManifest.xml + + ANDROID_PACKAGE_SOURCE_DIR = $${PWD}/android +} + + +#------------------------------------------------- +##project environ +#------------------------------------------------- +#default +message ($${TARGET} config $${CONFIG}) +message ($${TARGET} define $${DEFINES}) + + diff --git a/test/gumbo_query_test/gumbo_query_test.pro b/test/gumbo_query_test/gumbo_query_test.pro index 3a70f2ba..7e348db3 100644 --- a/test/gumbo_query_test/gumbo_query_test.pro +++ b/test/gumbo_query_test/gumbo_query_test.pro @@ -19,14 +19,21 @@ DEFINES += QT_DEPRECATED_WARNINGS SOURCES += main.cpp +#qmake_pre/post_link will work after source changed but not pro pri changed. +system("touch main.cpp") + #------------------------------------------------- #link qqt library #if you link a library to your app, on android you must select the running kit to the app, not LibQQt e.g. +#user can modify any infomation under this annotation #------------------------------------------------- include(../../examples/qqtframe2/link_qqt_library.pri) #------------------------------------------------- -#install +#user app may use these these settings prefertly +#------------------------------------------------- +#------------------------------------------------- +#install app #------------------------------------------------- #CONFIG += can_install can_install:equals(QKIT_PRIVATE, EMBEDDED) { @@ -39,6 +46,23 @@ can_install:equals(QKIT_PRIVATE, EMBEDDED) { } } +############ +##config defination +############ +equals(QKIT_PRIVATE, macOS) { + CONFIG += app_bundle +} + +contains(QKIT_PRIVATE, ANDROID|ANDROIDX86) { + CONFIG += mobility + MOBILITY = + DISTFILES += \ + android/AndroidManifest.xml + + ANDROID_PACKAGE_SOURCE_DIR = $${PWD}/android +} + + #------------------------------------------------- ##project environ #------------------------------------------------- @@ -46,17 +70,4 @@ can_install:equals(QKIT_PRIVATE, EMBEDDED) { message ($${TARGET} config $${CONFIG}) message ($${TARGET} define $${DEFINES}) -contains(QKIT_PRIVATE, ANDROID|ANDROIDX86) { - CONFIG += mobility - MOBILITY = - DISTFILES += \ - android/AndroidManifest.xml \ - android/gradle/wrapper/gradle-wrapper.jar \ - android/gradlew \ - android/res/values/libs.xml \ - android/build.gradle \ - android/gradle/wrapper/gradle-wrapper.properties \ - android/gradlew.bat - ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android -} diff --git a/test/qqtbtfileserver/qqtbtfileserver.pro b/test/qqtbtfileserver/qqtbtfileserver.pro index fe1725d4..458ccd4d 100644 --- a/test/qqtbtfileserver/qqtbtfileserver.pro +++ b/test/qqtbtfileserver/qqtbtfileserver.pro @@ -39,13 +39,21 @@ FORMS += \ CONFIG += mobility MOBILITY = +#qmake_pre/post_link will work after source changed but not pro pri changed. +system("touch main.cpp") + #------------------------------------------------- #link qqt library +#if you link a library to your app, on android you must select the running kit to the app, not LibQQt e.g. +#user can modify any infomation under this annotation #------------------------------------------------- include(../../examples/qqtframe2/link_qqt_library.pri) #------------------------------------------------- -#install +#user app may use these these settings prefertly +#------------------------------------------------- +#------------------------------------------------- +#install app #------------------------------------------------- #CONFIG += can_install can_install:equals(QKIT_PRIVATE, EMBEDDED) { @@ -58,11 +66,23 @@ can_install:equals(QKIT_PRIVATE, EMBEDDED) { } } -equals(QKIT_PRIVATE, ANDROID) { +############ +##config defination +############ +equals(QKIT_PRIVATE, macOS) { + CONFIG += app_bundle +} + +contains(QKIT_PRIVATE, ANDROID|ANDROIDX86) { CONFIG += mobility MOBILITY = + DISTFILES += \ + android/AndroidManifest.xml + + ANDROID_PACKAGE_SOURCE_DIR = $${PWD}/android } + #------------------------------------------------- ##project environ #------------------------------------------------- @@ -70,3 +90,4 @@ equals(QKIT_PRIVATE, ANDROID) { message ($${TARGET} config $${CONFIG}) message ($${TARGET} define $${DEFINES}) + diff --git a/test/qqtdicttest/main.cpp b/test/qqtdicttest/main.cpp new file mode 100644 index 00000000..e69de29b diff --git a/test/qqtdicttest/qqtdicttest.pro b/test/qqtdicttest/qqtdicttest.pro index f14d65d9..51c5aa2b 100644 --- a/test/qqtdicttest/qqtdicttest.pro +++ b/test/qqtdicttest/qqtdicttest.pro @@ -29,4 +29,55 @@ SOURCES += \ DEFINES += SRCDIR=\\\"$$PWD/\\\" -include (../../examples/qqtframe2/link_qqt_library.pri) +#qmake_pre/post_link will work after source changed but not pro pri changed. +system("touch main.cpp") + +#------------------------------------------------- +#link qqt library +#if you link a library to your app, on android you must select the running kit to the app, not LibQQt e.g. +#user can modify any infomation under this annotation +#------------------------------------------------- +include(../../examples/qqtframe2/link_qqt_library.pri) + +#------------------------------------------------- +#user app may use these these settings prefertly +#------------------------------------------------- +#------------------------------------------------- +#install app +#------------------------------------------------- +#CONFIG += can_install +can_install:equals(QKIT_PRIVATE, EMBEDDED) { + target.path = /Application + INSTALLS += target +} else: unix { + equals(QKIT_PRIVATE, macOS) { + target.path = /Applications + INSTALLS += target + } +} + +############ +##config defination +############ +equals(QKIT_PRIVATE, macOS) { + CONFIG += app_bundle +} + +contains(QKIT_PRIVATE, ANDROID|ANDROIDX86) { + CONFIG += mobility + MOBILITY = + DISTFILES += \ + android/AndroidManifest.xml + + ANDROID_PACKAGE_SOURCE_DIR = $${PWD}/android +} + + +#------------------------------------------------- +##project environ +#------------------------------------------------- +#default +message ($${TARGET} config $${CONFIG}) +message ($${TARGET} define $${DEFINES}) + + diff --git a/test/qqtwebclient/qqtwebclient.pro b/test/qqtwebclient/qqtwebclient.pro index 509ebe58..33048ef1 100644 --- a/test/qqtwebclient/qqtwebclient.pro +++ b/test/qqtwebclient/qqtwebclient.pro @@ -3,7 +3,6 @@ # Project created by QtCreator 2016-06-17T10:03:52 # #------------------------------------------------- -include(../../examples/qqtframe2/link_qqt_library.pri) QT += core gui webkitwidgets @@ -20,3 +19,56 @@ SOURCES += $$PWD/main.cpp $$PWD/qqtapp.cpp $$PWD/qqtwindow.cpp HEADERS += $$PWD/qqtapp.h $$PWD/qqtwindow.h FORMS += $$PWD/qqtwindow.ui + +#qmake_pre/post_link will work after source changed but not pro pri changed. +system("touch main.cpp") + +#------------------------------------------------- +#link qqt library +#if you link a library to your app, on android you must select the running kit to the app, not LibQQt e.g. +#user can modify any infomation under this annotation +#------------------------------------------------- +include(../../examples/qqtframe2/link_qqt_library.pri) + +#------------------------------------------------- +#user app may use these these settings prefertly +#------------------------------------------------- +#------------------------------------------------- +#install app +#------------------------------------------------- +#CONFIG += can_install +can_install:equals(QKIT_PRIVATE, EMBEDDED) { + target.path = /Application + INSTALLS += target +} else: unix { + equals(QKIT_PRIVATE, macOS) { + target.path = /Applications + INSTALLS += target + } +} + +############ +##config defination +############ +equals(QKIT_PRIVATE, macOS) { + CONFIG += app_bundle +} + +contains(QKIT_PRIVATE, ANDROID|ANDROIDX86) { + CONFIG += mobility + MOBILITY = + DISTFILES += \ + android/AndroidManifest.xml + + ANDROID_PACKAGE_SOURCE_DIR = $${PWD}/android +} + + +#------------------------------------------------- +##project environ +#------------------------------------------------- +#default +message ($${TARGET} config $${CONFIG}) +message ($${TARGET} define $${DEFINES}) + + diff --git a/test/qqtwebkittest/qqtwebkittest.pro b/test/qqtwebkittest/qqtwebkittest.pro index 4ae8fef8..a42f8de5 100644 --- a/test/qqtwebkittest/qqtwebkittest.pro +++ b/test/qqtwebkittest/qqtwebkittest.pro @@ -3,8 +3,6 @@ # Project created by QtCreator 2016-06-17T10:03:52 # #------------------------------------------------- -include(../../examples/qqtframe2/link_qqt_library.pri) - QT += core gui webkit webkitwidgets greaterThan(QT_MAJOR_VERSION, 4): QT += widgets @@ -20,3 +18,56 @@ SOURCES += $$PWD/main.cpp $$PWD/qqtapp.cpp $$PWD/qqtwindow.cpp HEADERS += $$PWD/qqtapp.h $$PWD/qqtwindow.h FORMS += $$PWD/qqtwindow.ui + +#qmake_pre/post_link will work after source changed but not pro pri changed. +system("touch main.cpp") + +#------------------------------------------------- +#link qqt library +#if you link a library to your app, on android you must select the running kit to the app, not LibQQt e.g. +#user can modify any infomation under this annotation +#------------------------------------------------- +include(../../examples/qqtframe2/link_qqt_library.pri) + +#------------------------------------------------- +#user app may use these these settings prefertly +#------------------------------------------------- +#------------------------------------------------- +#install app +#------------------------------------------------- +#CONFIG += can_install +can_install:equals(QKIT_PRIVATE, EMBEDDED) { + target.path = /Application + INSTALLS += target +} else: unix { + equals(QKIT_PRIVATE, macOS) { + target.path = /Applications + INSTALLS += target + } +} + +############ +##config defination +############ +equals(QKIT_PRIVATE, macOS) { + CONFIG += app_bundle +} + +contains(QKIT_PRIVATE, ANDROID|ANDROIDX86) { + CONFIG += mobility + MOBILITY = + DISTFILES += \ + android/AndroidManifest.xml + + ANDROID_PACKAGE_SOURCE_DIR = $${PWD}/android +} + + +#------------------------------------------------- +##project environ +#------------------------------------------------- +#default +message ($${TARGET} config $${CONFIG}) +message ($${TARGET} define $${DEFINES}) + + diff --git a/test/soapQQtOnline/soapQQtOnline.pro b/test/soapQQtOnline/soapQQtOnline.pro index 7f4db739..c6a696f6 100644 --- a/test/soapQQtOnline/soapQQtOnline.pro +++ b/test/soapQQtOnline/soapQQtOnline.pro @@ -3,21 +3,6 @@ # Project created by QtCreator 2017-10-27T20:06:56 # #------------------------------------------------- -include(../../examples/qqtframe2/link_qqt_library.pri) - -############ -##install -############ -#CONFIG += can_install -can_install:equals(QKIT_PRIVATE, EMBEDDED) { - target.path = /Application - INSTALLS += target -} else: unix { - equals(QKIT_PRIVATE, macOS) { - target.path = /Applications - INSTALLS += target - } -} QT += core gui @@ -45,6 +30,55 @@ SOURCES += \ HEADERS += \ mainwindow.h -CONFIG += mobility -MOBILITY = +#qmake_pre/post_link will work after source changed but not pro pri changed. +system("touch main.cpp") + +#------------------------------------------------- +#link qqt library +#if you link a library to your app, on android you must select the running kit to the app, not LibQQt e.g. +#user can modify any infomation under this annotation +#------------------------------------------------- +include(../../examples/qqtframe2/link_qqt_library.pri) + +#------------------------------------------------- +#user app may use these these settings prefertly +#------------------------------------------------- +#------------------------------------------------- +#install app +#------------------------------------------------- +#CONFIG += can_install +can_install:equals(QKIT_PRIVATE, EMBEDDED) { + target.path = /Application + INSTALLS += target +} else: unix { + equals(QKIT_PRIVATE, macOS) { + target.path = /Applications + INSTALLS += target + } +} + +############ +##config defination +############ +equals(QKIT_PRIVATE, macOS) { + CONFIG += app_bundle +} + +contains(QKIT_PRIVATE, ANDROID|ANDROIDX86) { + CONFIG += mobility + MOBILITY = + DISTFILES += \ + android/AndroidManifest.xml + + ANDROID_PACKAGE_SOURCE_DIR = $${PWD}/android +} + + +#------------------------------------------------- +##project environ +#------------------------------------------------- +#default +message ($${TARGET} config $${CONFIG}) +message ($${TARGET} define $${DEFINES}) + diff --git a/test/svgtest/svgtest.pro b/test/svgtest/svgtest.pro index 476fb575..548724ac 100644 --- a/test/svgtest/svgtest.pro +++ b/test/svgtest/svgtest.pro @@ -37,14 +37,21 @@ CONFIG += mobility MOBILITY = +#qmake_pre/post_link will work after source changed but not pro pri changed. +system("touch main.cpp") + #------------------------------------------------- #link qqt library #if you link a library to your app, on android you must select the running kit to the app, not LibQQt e.g. +#user can modify any infomation under this annotation #------------------------------------------------- include(../../examples/qqtframe2/link_qqt_library.pri) #------------------------------------------------- -#install +#user app may use these these settings prefertly +#------------------------------------------------- +#------------------------------------------------- +#install app #------------------------------------------------- #CONFIG += can_install can_install:equals(QKIT_PRIVATE, EMBEDDED) { @@ -57,6 +64,23 @@ can_install:equals(QKIT_PRIVATE, EMBEDDED) { } } +############ +##config defination +############ +equals(QKIT_PRIVATE, macOS) { + CONFIG += app_bundle +} + +contains(QKIT_PRIVATE, ANDROID|ANDROIDX86) { + CONFIG += mobility + MOBILITY = + DISTFILES += \ + android/AndroidManifest.xml + + ANDROID_PACKAGE_SOURCE_DIR = $${PWD}/android +} + + #------------------------------------------------- ##project environ #------------------------------------------------- @@ -64,17 +88,4 @@ can_install:equals(QKIT_PRIVATE, EMBEDDED) { message ($${TARGET} config $${CONFIG}) message ($${TARGET} define $${DEFINES}) -contains(QKIT_PRIVATE, ANDROID|ANDROIDX86) { - CONFIG += mobility - MOBILITY = - DISTFILES += \ - android/AndroidManifest.xml \ - android/gradle/wrapper/gradle-wrapper.jar \ - android/gradlew \ - android/res/values/libs.xml \ - android/build.gradle \ - android/gradle/wrapper/gradle-wrapper.properties \ - android/gradlew.bat - ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android -} diff --git a/test/treeviewtest/treeviewtest.pro b/test/treeviewtest/treeviewtest.pro index 70163907..dcd72f87 100644 --- a/test/treeviewtest/treeviewtest.pro +++ b/test/treeviewtest/treeviewtest.pro @@ -37,14 +37,21 @@ CONFIG += mobility MOBILITY = +#qmake_pre/post_link will work after source changed but not pro pri changed. +system("touch main.cpp") + #------------------------------------------------- #link qqt library #if you link a library to your app, on android you must select the running kit to the app, not LibQQt e.g. +#user can modify any infomation under this annotation #------------------------------------------------- include(../../examples/qqtframe2/link_qqt_library.pri) #------------------------------------------------- -#install +#user app may use these these settings prefertly +#------------------------------------------------- +#------------------------------------------------- +#install app #------------------------------------------------- #CONFIG += can_install can_install:equals(QKIT_PRIVATE, EMBEDDED) { @@ -57,6 +64,23 @@ can_install:equals(QKIT_PRIVATE, EMBEDDED) { } } +############ +##config defination +############ +equals(QKIT_PRIVATE, macOS) { + CONFIG += app_bundle +} + +contains(QKIT_PRIVATE, ANDROID|ANDROIDX86) { + CONFIG += mobility + MOBILITY = + DISTFILES += \ + android/AndroidManifest.xml + + ANDROID_PACKAGE_SOURCE_DIR = $${PWD}/android +} + + #------------------------------------------------- ##project environ #------------------------------------------------- @@ -64,18 +88,4 @@ can_install:equals(QKIT_PRIVATE, EMBEDDED) { message ($${TARGET} config $${CONFIG}) message ($${TARGET} define $${DEFINES}) -contains(QKIT_PRIVATE, ANDROID|ANDROIDX86) { - CONFIG += mobility - MOBILITY = - DISTFILES += \ - android/AndroidManifest.xml \ - android/gradle/wrapper/gradle-wrapper.jar \ - android/gradlew \ - android/res/values/libs.xml \ - android/build.gradle \ - android/gradle/wrapper/gradle-wrapper.properties \ - android/gradlew.bat - - ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android -}