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

update sdk position

Browse Source
This commit is contained in:
tianduanrui 2017-11-25 20:32:09 +08:00
parent 75db205bd8
commit 5d00897f27
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qqt.pro
View File

@ -78,7 +78,7 @@ QMAKE_CXXFLAGS += $${CLFLAGS}
#QMAKE_POST_LINK won't work until source changed #QMAKE_POST_LINK won't work until source changed
#qmake pro pri prf change won't effect to QMAKE_POST_LINK #qmake pro pri prf change won't effect to QMAKE_POST_LINK
#but I need it before I complete this pri. #but I need it before I complete this pri.
system("touch $${PWD}/widgets/qqtapplication.cpp") system("touch $${PWD}/frame/qqtapplication.cpp")
################################################################# #################################################################
##project Headers ##project Headers
################################################################# #################################################################

16
src/qqt_install.pri
View File

@ -134,7 +134,7 @@ defineTest(write_file) {
defineReplace(create_dir_struct) { defineReplace(create_dir_struct) {
#if it's qt library, don't create #if it's qt library, don't create
command = command =
!equals(QQT_SDK_DIR , $$[QT_INSTALL_DATA]){ !equals(QQT_SDK_PWD , $$[QT_INSTALL_DATA]){
!contains(QKIT_PRIVATE, macOS) { !contains(QKIT_PRIVATE, macOS) {
command += $$MK_DIR $$QQT_INC_DIR $$CMD_SEP command += $$MK_DIR $$QQT_INC_DIR $$CMD_SEP
} }
@ -241,8 +241,8 @@ contains(CONFIG, qqt_create_sdk){
QQT_BUILD_DIR=$$OUT_PWD/bin QQT_BUILD_DIR=$$OUT_PWD/bin
#sdk path #sdk path
QQT_SDK_DIR = $$PWD/../../sdk QQT_SDK_PWD = $${PWD}/../../$${QQT_STD_DIR}
message(QQt sdk install here:$${QQT_SDK_DIR}) message(QQt sdk install here:$${QQT_SDK_PWD})
QQT_INC_DIR = include/$${MODULE_NAME} QQT_INC_DIR = include/$${MODULE_NAME}
QQT_LIB_DIR = lib QQT_LIB_DIR = lib
@ -251,9 +251,9 @@ contains(CONFIG, qqt_create_sdk){
QQT_PRI_FILEPATH=$${QQT_PRI_PATH}/qt_lib_$${module_name}.pri QQT_PRI_FILEPATH=$${QQT_PRI_PATH}/qt_lib_$${module_name}.pri
post_link = post_link =
post_link += $$RM_DIR $$QQT_SDK_DIR $$CMD_SEP post_link += $$RM_DIR $$QQT_SDK_PWD $$CMD_SEP
post_link += $$MK_DIR $$QQT_SDK_DIR $$CMD_SEP post_link += $$MK_DIR $$QQT_SDK_PWD $$CMD_SEP
post_link += $$CD $$QQT_SDK_DIR $$CMD_SEP post_link += $$CD $$QQT_SDK_PWD $$CMD_SEP
post_link += $$create_dir_struct() post_link += $$create_dir_struct()
contains(QKIT_PRIVATE, macOS) { contains(QKIT_PRIVATE, macOS) {
@ -280,6 +280,6 @@ contains(CONFIG, install_to_qt_library){
MODULE_NAME=QQt MODULE_NAME=QQt
QQT_BUILD_DIR=$$OUT_PWD/bin QQT_BUILD_DIR=$$OUT_PWD/bin
#sdk path #sdk path
QQT_SDK_DIR=$$[QT_INSTALL_DATA] QQT_SDK_PWD=$$[QT_INSTALL_DATA]
message(QQt sdk install here:$${QQT_SDK_DIR}) message(QQt sdk install here:$${QQT_SDK_PWD})
} }

2
src/qqt_kit.pri
View File

@ -119,3 +119,5 @@ equals(QKIT_PRIVATE, EMBEDDED) {
} }
message(Build $${TARGET} at $${QT_VERSION} $${SYSNAME} $${BUILD}) message(Build $${TARGET} at $${QT_VERSION} $${SYSNAME} $${BUILD})
message(Build $${TARGET} on $${QMAKE_HOST.os}) message(Build $${TARGET} on $${QMAKE_HOST.os})
QQT_STD_DIR = QQt/$${QT_VERSION}/$${SYSNAME}/$${BUILD}

11
src/qqt_library.pri
View File

@ -14,13 +14,12 @@ message(Link QQt to $${TARGET} $${QKIT_PRIVATE} \
at $${QT_VERSION} $${SYSNAME} $${BUILD} \ at $${QT_VERSION} $${SYSNAME} $${BUILD} \
on $${QMAKE_HOST.os}) on $${QMAKE_HOST.os})
#this configration need Qt Creator set default build directory
#%{CurrentProject:Name}/%{Qt:Version}/%{CurrentKit:FileSystemName}/%{CurrentBuild:Name}")}
contains(CONFIG, link_from_build) { contains(CONFIG, link_from_build) {
#this configration need Qt Creator set default build directory QQT_LIB_PWD = $${QQT_BUILD_ROOT}/$${QQT_STD_DIR}/src/$${DESTDIR}
#%{CurrentProject:Name}/%{Qt:Version}/%{CurrentKit:FileSystemName}/%{CurrentBuild:Name}")}
QQT_BUILD_OUT_PWD = QQt/$${QT_VERSION}/$${SYSNAME}/$${BUILD}/src/$${DESTDIR}
QQT_LIB_PWD = $${QQT_BUILD_ROOT}/$${QQT_BUILD_OUT_PWD}
} else { } else {
QQT_LIB_PWD = $$PWD/../../sdk/lib QQT_LIB_PWD = $${PWD}/../../$${QQT_STD_DIR}/lib
} }
message (Link QQt from: $$QQT_LIB_PWD) message (Link QQt from: $$QQT_LIB_PWD)
@ -55,7 +54,7 @@ equals(QKIT_PRIVATE, macOS) {
command += mkdir -p $$QQT_BUNDLE_VER_DIR $$CMD_SEP command += mkdir -p $$QQT_BUNDLE_VER_DIR $$CMD_SEP
command += mkdir -p $$QQT_BUNDLE_INC_DIR $$CMD_SEP command += mkdir -p $$QQT_BUNDLE_INC_DIR $$CMD_SEP
#copy lib #copy lib
command += cp -rf $$QQT_LIB_PWD/$${MODULE_NAME}.framework/$${QQT_BUNDLE_VER_DIR}/* $$QQT_BUNDLE_VER_DIR $$CMD_SEP command += cp -rf $${QQT_LIB_PWD}/$${MODULE_NAME}.framework/$${QQT_BUNDLE_VER_DIR}/* $$QQT_BUNDLE_VER_DIR $$CMD_SEP
#link header current resources #link header current resources
command += cd Versions $$CMD_SEP command += cd Versions $$CMD_SEP
command += ln -sf $${QQT_MAJOR_VERSION} $${QQT_BUNDLE_CUR_LINK} $$CMD_SEP command += ln -sf $${QQT_MAJOR_VERSION} $${QQT_BUNDLE_CUR_LINK} $$CMD_SEP