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 qt4 qmake flow

Browse Source
This commit is contained in:
tianduanrui 2018-01-09 12:11:59 +08:00
parent 8e64098618
commit e7d0bff5a9
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/exquisite/main.cpp
View File

@ -18,7 +18,7 @@ public:
QString fontfile = QProcessEnvironment::systemEnvironment().value("QTDIR");
fontfile += "/lib/fonts/wenquanyi.ttf";
int fontsize = 14;
setTextFont(fontfile, fontsize);
//setTextFont(fontfile, fontsize);
#endif
}
virtual ~MainApplication() {}

30
src/app_deploy_config.pri
View File

@ -2,24 +2,14 @@
#应用程序配置文件拷贝qmake文件。通过qmake与编译调用。
#如果需要修改拷贝到发布目录里的配置文件，修改配置PWD下的文件，即可引起编译PWD和发布PWD配置文件的改变。
#这个pri会拷贝配置PWD下的所有文件、文件夹到编译PWD和发布PWD下。
#---------------------------------------------------------------------
#依赖 APP_CONFIG_PWD(in app pro) APP_DEPLOY_PWD(in app deploy)
#---------------------------------------------------------------------
#example（in app's pro file）
#APP_CONFIG_PWD = $${PWD}/../SysRoot
#win32 {
# APP_CONFIG_PWD ~=s,/,\\,g
#}
#如果 TARGET 没有配置 APP_CONFIG_PWD 那么返回，不拷贝任何配置
isEmpty(APP_CONFIG_PWD)||isEmpty(APP_DEPLOY_PWD) {
message("$${TARGET} hasn't deploy any cofig file")
return()
}
APP_DEST_DIR=$${DESTDIR}
isEmpty(APP_DEST_DIR):APP_DEST_DIR=.
defineReplace(copy_config_on_mac) {
#need QQT_BUILD_PWD
dirs = $$1
@ -48,8 +38,24 @@ defineReplace(copy_config) {
return ($$command)
}
CONFIG += app_copy_config
##-------------------------------------------------
##work flow
##-------------------------------------------------
#如果 TARGET 没有配置 APP_CONFIG_PWD 那么返回，不拷贝任何配置
isEmpty(APP_CONFIG_PWD) | isEmpty(APP_DEPLOY_PWD) {
message("$${TARGET} hasn't deploied any cofig files")
greaterThan(QT_MAJOR_VERSION, 5):return()
}
##4.8 qmake arm32 return() 函数无效
!isEmpty(APP_CONFIG_PWD) & !isEmpty(APP_DEPLOY_PWD) {
CONFIG += app_copy_config
message("$${TARGET} has deploied some cofig files")
}
contains(CONFIG, app_copy_config) {
APP_DEST_DIR=$${DESTDIR}
isEmpty(APP_DEST_DIR):APP_DEST_DIR=.
contains(QKIT_PRIVATE, WIN32||WIN64) {
QMAKE_POST_LINK += $$copy_config("$${APP_CONFIG_PWD}\\*")
} else: contains(QKIT_PRIVATE, macOS) {