1
0
mirror of https://gitee.com/drabel/LibQQt.git synced 2025-01-04 10:18:44 +08:00

fix winRT building

This commit is contained in:
tianduanrui 2019-03-26 23:25:46 +08:00
parent 43fa8fdd81
commit 2b6faaef24
3 changed files with 10 additions and 6 deletions

@ -1 +1 @@
Subproject commit 682fc0e0925ef34749453d2080496b10f5d82fde
Subproject commit 7faa1ecf0c98f2db7f3b3acab418586d047c7f68

View File

@ -320,8 +320,11 @@ defineTest(add_defines_QQt){
#if you use qextserialport, open the annotation
#suggest: Qt5 using factory-packed, Qt4 using from Qt5, extra using this.
#DEFINES += __QEXTSERIALPORT__
#if compiler QtSerialPort module manual, note this line is a good idea. default: qt4 qextserialport
lessThan(QT_MAJOR_VERSION, 5): DEFINES += __QEXTSERIALPORT__
#to winRT, ues qextserialport
contains (DEFINES, __WINRT__): DEFINES += __QEXTSERIALPORT__
#to ios, use qextserialport
contains (DEFINES, __IOS__): DEFINES += __QEXTSERIALPORT__
#android qt5 has QtSerialport?

View File

@ -19,13 +19,13 @@ HEADERS += $$PWD/qqt.h \
$$PWD/qqtversion.h \
$$PWD/qqt-qt.h
#platform header
contains (QSYS_PRIVATE, Win32|Windows|Win64 || MSVC32|MSVC|MSVC64) {
contains (DEFINES, __WIN__) {
#win32 base header
HEADERS += $$PWD/qqtwin.h
} else:contains (QSYS_PRIVATE, macOS||iOS||iOSSimulator) {
} else:contains (DEFINES, __DARWIN__) {
#mac base header
HEADERS += $$PWD/qqtdarwin.h
} else:contains (QSYS_PRIVATE, Android||AndroidX86) {
} else:contains (DEFINES, __ANDROID__) {
#android base header
HEADERS += $$PWD/qqtandroid.h
} else {
@ -48,12 +48,13 @@ SOURCES += \
HEADERS += \
$$PWD/core/qqtevent.h
##################Process Module###############################
#后台进程支持。
#这个只有ios不支持在源文件pri里处理
#ios\winRT 不支持。
#可以添加QQtProcess适配正常平台使用QProcess继承下来iOS下使用fork封装。
DEFINES += __PROCESSSUPPORT__
#ios has no backend process
contains(QSYS_PRIVATE, iOS||iOSSimulator) {
contains(DEFINES, __IOS__ || __WINRT__) {
DEFINES -= __PROCESSSUPPORT__
}