From e44361e6b7610b496550579f72837d1b54dc78d4 Mon Sep 17 00:00:00 2001 From: tianduanrui <2407223896@qq.com> Date: Sun, 22 Oct 2017 22:02:09 +0800 Subject: [PATCH] fix ios compiler change --- src/qqt-qt.h | 1 + src/qqt_header.pri | 5 ----- src/qqt_source.pri | 3 +-- src/qqtdarwin.h | 2 ++ src/widgets/qqtapplication.cpp | 1 + 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/qqt-qt.h b/src/qqt-qt.h index d9933010..437488a5 100644 --- a/src/qqt-qt.h +++ b/src/qqt-qt.h @@ -17,6 +17,7 @@ #include #include #include +#include #include #include diff --git a/src/qqt_header.pri b/src/qqt_header.pri index edbdbf0c..26fe70af 100644 --- a/src/qqt_header.pri +++ b/src/qqt_header.pri @@ -58,8 +58,6 @@ equals(QKIT_, EMBEDDED) { DEFINES += __WIN64__ } else:equals(QKIT_, macOS) { DEFINES += __DARWIN__ -} else:equals(QKIT_, iOS) { - DEFINES += __IOS__ } else:equals(QKIT_, Android) { DEFINES += __ANDROID__ } else:equals(QKIT_, ANDROIDX86) { @@ -80,9 +78,6 @@ greaterThan(QT_MAJOR_VERSION, 4): DEFINES += __QT5__ #if you use qextserialport, open the annotation #suggest: Qt5 use factory-packed, Qt4 use forming Qt5, extra use this. #DEFINES += __QEXTSERIALPORT__ -equals(QKIT_, iOS) { - DEFINES += __QEXTSERIALPORT__ -} contains (DEFINES, __QEXTSERIALPORT__) { #include ( $$PWD/network/qextserialport/qextserialport.pri ) CONFIG += thread diff --git a/src/qqt_source.pri b/src/qqt_source.pri index 8105d8c0..be3937eb 100644 --- a/src/qqt_source.pri +++ b/src/qqt_source.pri @@ -24,6 +24,7 @@ win32 { } } +#exquisite SOURCES = \ $$PWD/exquisite/qqtcustomspeedmeter.cpp \ $$PWD/exquisite/qqtframelesshelper.cpp \ @@ -93,8 +94,6 @@ win32 { unix { equals(QKIT_, macOS) { HEADERS += $$PWD/qqtdarwin.h - } else:equals(QKIT_, iOS) { - HEADERS += $$PWD/qqtdarwin.h } else { HEADERS += $$PWD/qqtlinux.h } diff --git a/src/qqtdarwin.h b/src/qqtdarwin.h index 0f3ad811..54fbdeec 100644 --- a/src/qqtdarwin.h +++ b/src/qqtdarwin.h @@ -27,7 +27,9 @@ extern "C" { #include #include #include +#if defined (__DARWIN__) #include +#endif #include #ifdef __cplusplus diff --git a/src/widgets/qqtapplication.cpp b/src/widgets/qqtapplication.cpp index 45da11f3..2793ba8c 100644 --- a/src/widgets/qqtapplication.cpp +++ b/src/widgets/qqtapplication.cpp @@ -10,6 +10,7 @@ #include #include #include +#include QQtApplication::QQtApplication(int& argc, char** argv) : QApplication(argc, argv),