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 profile logic

Browse Source
This commit is contained in:
tianduanrui 2017-10-27 18:41:41 +08:00
parent c80e1193c2
commit 5f66c70232
3 changed files with 33 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
examples/qqt_library.pri
View File

@ -15,7 +15,7 @@ equals(QMAKE_HOST.os, Darwin) {
QQT_OUT_PWD = QQt/$${QT_VERSION}/$${SYSNAME}/$${BUILD}/src
QQT_OUT_BIN = $${QQT_OUT_PWD}/$${DESTDIR}
QQT_LIB_PWD = $$BUILDROOT/$$QQT_OUT_BIN
message (QQt Build: $$QQT_LIB_PWD)
#message (QQt Build: $$QQT_LIB_PWD)
contains(DEFINES, __DARWIN__) {
lessThan(QT_MAJOR_VERSION, 5):{
@ -44,6 +44,18 @@ can_install:equals(QKIT_, EMBEDDED) {
}
}
#not good to use, some function error
#CONFIG += qmake_deploy
qmake_deploy:equals(QKIT_, macOS) {
QQT_MAJOR_VERSION = 1
QMAKE_POST_LINK += 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 &
QMAKE_POST_LINK += cp -fr ../../src/bin/QQt.framework \
bin/$${TARGET}.app/Contents/Frameworks &
QMAKE_POST_LINK += macdeployqt bin/$${TARGET}.app -qmldir=$$PWD -verbose=1
}
############
##config defination
############
@ -59,19 +71,3 @@ equals(QKIT_, Android) {
#ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
}
equals(QKIT_, macOS) {
QMAKE_POST_LINK = install_name_tool -change QQt.framework/Versions/1/QQt \
@rpath/QQt.framework/Versions/1/QQt \
bin/$$TARGET.app/Contents/MacOS/$$TARGET
}
################################################
##install QQt sdk
##library file is here
################################################
#CONFIG += can_install_sdk
can_install_sdk:equals(QKIT_, macOS) {
###if install product to same path,use this.
target.path = /System/Library/Frameworks
INSTALLS += target
}

14
src/qqt.pro
View File

@ -3,13 +3,6 @@
# Project created by QtCreator 2016-03-24T14:08:11
#
#-------------------------------------------------
#################################################################
##project environ
#################################################################
#default
message ($${TARGET} config $${CONFIG})
message ($${TARGET} define $${DEFINES})
#################################################################
##project name
#################################################################
@ -93,3 +86,10 @@ include ($$PWD/qqt_source.pri)
################################################
RESOURCES += \
qqt.qrc
#################################################################
##project environ
#################################################################
#default
message ($${TARGET} config $${CONFIG})
message ($${TARGET} define $${DEFINES})

26
src/qqt_source.pri
View File

@ -199,7 +199,7 @@ contains (DEFINES, __PRINTSUPPORT__) {
#need print support
#DEFINES += __CUSTOMPLOT__
contains (DEFINES, __CUSTOMPLOT__) {
message (qcustomplot is used in $${TARGET})
#message (qcustomplot is used in $${TARGET})
contains (DEFINES, QQT_LIBRARY) {
DEFINES += QCUSTOMPLOT_COMPILE_LIBRARY
}
@ -272,18 +272,6 @@ equals(QKIT_, EMBEDDED) {
FORMS += $$PWD/frame/qqtwifiwidget.ui
}
##websocket
contains (DEFINES, __WEBSOCKETSUPPORT__) {
SOURCES += $$PWD/network/qqtwebclient.cpp \
$$PWD/network/qqtftpprotocol.cpp \
$$PWD/network/qqthttpprotocol.cpp \
$$PWD/network/qqtwebprotocol.cpp
HEADERS += $$PWD/network/qqtwebclient.h \
$$PWD/network/qqtftpprotocol.h \
$$PWD/network/qqthttpprotocol.h \
$$PWD/network/qqtwebprotocol.h
}
contains (DEFINES, __EXQUISITE__) {
#exquisite
SOURCES += \
@ -349,3 +337,15 @@ contains (DEFINES, __EXQUISITE__) {
$$PWD/exquisite/qqtcustomqrencodewidget.cpp
}
}
##websocket
contains (DEFINES, __WEBSOCKETSUPPORT__) {
SOURCES += $$PWD/network/qqtwebclient.cpp \
$$PWD/network/qqtftpprotocol.cpp \
$$PWD/network/qqthttpprotocol.cpp \
$$PWD/network/qqtwebprotocol.cpp
HEADERS += $$PWD/network/qqtwebclient.h \
$$PWD/network/qqtftpprotocol.h \
$$PWD/network/qqthttpprotocol.h \
$$PWD/network/qqtwebprotocol.h
}