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

Merge branch 'dev-multilink'

Browse Source
This commit is contained in:
tianduanrui 2018-06-20 17:48:28 +08:00
commit 555029befb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
multi-link

@ -1 +1 @@
Subproject commit 7f59bd717d6de00318b6895f3bd47617285120df
Subproject commit c204d8b898f48938e383e10ee03643ccf35c51ef

6
src/qqt_header.pri
View File

@ -170,7 +170,7 @@ defineTest(add_defines_QQt){
#Qt Embedded，没有charts模块
#对于这两种情况，默认删除去。如果用户自己编译了Charts，手动添加charts模块。
lessThan(QT_VERSION, 5.7):DEFINES-=__QT_CHARTS__
contains(QSYS_PRIVATE, Arm32||Mips32||Embedded):DEFINES-=__QT_CHARTS__
contains(QSYS_PRIVATE, Arm32|Armhf32 || Mips32 || Embedded):DEFINES-=__QT_CHARTS__
#based on QtCharts, need charts module
contains(DEFINES, __QT_CHARTS__ ): QT += charts
@ -256,7 +256,7 @@ defineTest(add_defines_QQt){
#if you use QNetworkAccessManagerSupport , open this annotation
DEFINES += __WEBACCESSSUPPORT__
lessThan(QT_MAJOR_VERSION, 5): DEFINES -= __WEBACCESSSUPPORT__
contains(QSYS_PRIVATE, Arm32||Mips32||Embedded):DEFINES -= __WEBACCESSSUPPORT__
contains(QSYS_PRIVATE, Arm32|Armhf32 || Mips32 || Embedded):DEFINES -= __WEBACCESSSUPPORT__
contains (DEFINES, __WEBACCESSSUPPORT__) {
#QSslError not found, you need recompiler Qt4
}
@ -334,7 +334,7 @@ defineTest(add_defines_QQt){
#opengl module
DEFINES += __OPENGLWIDGETS__
contains(QSYS_PRIVATE, Mips32||Arm32||Embedded):DEFINES-=__OPENGLWIDGETS__
contains(QSYS_PRIVATE, Arm32|Armhf32 || Mips32 || Embedded):DEFINES-=__OPENGLWIDGETS__
contains (DEFINES, __OPENGLWIDGETS__) {
QT += opengl
}