diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-10-02 18:13:22 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-10-02 18:18:31 +0200 |
| commit | ccf968c05c1ed1d9ee749577ece8413a3a050337 (patch) | |
| tree | 57f9d0d89f72ba65524879901120192b29bd8100 /src/tools/3rdparty/iossim | |
| parent | 44dd2b6bdf22c61889cae586fa463a3f56b2664c (diff) | |
| download | qt-creator-ccf968c05c1ed1d9ee749577ece8413a3a050337.tar.gz | |
Ios: Fix compilation with Qt4
Change-Id: I6505d158d2456bc63572e274b47dcef486ca241d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/tools/3rdparty/iossim')
| -rw-r--r-- | src/tools/3rdparty/iossim/iossim.pro | 2 | ||||
| -rw-r--r-- | src/tools/3rdparty/iossim/main.mm | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/tools/3rdparty/iossim/iossim.pro b/src/tools/3rdparty/iossim/iossim.pro index b613d7046e..77f1604db5 100644 --- a/src/tools/3rdparty/iossim/iossim.pro +++ b/src/tools/3rdparty/iossim/iossim.pro @@ -7,7 +7,7 @@ include(../../../../qtcreator.pri) # Prevent from popping up in the dock when launched. # We embed the Info.plist file, so the application doesn't need to # be a bundle. -QMAKE_LFLAGS += -sectcreate __TEXT __info_plist $$shell_quote($$PWD/Info.plist) \ +QMAKE_LFLAGS += -sectcreate __TEXT __info_plist \"$$PWD/Info.plist\" \ -fobjc-link-runtime LIBS += \ diff --git a/src/tools/3rdparty/iossim/main.mm b/src/tools/3rdparty/iossim/main.mm index 1f6d7ba412..29b67c5c33 100644 --- a/src/tools/3rdparty/iossim/main.mm +++ b/src/tools/3rdparty/iossim/main.mm @@ -8,7 +8,11 @@ #import <AppKit/AppKit.h> #import "iphonesimulator.h" #include <QLibrary> +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) +#include <QApplication> +#else #include <QGuiApplication> +#endif #include <QString> #include <QStringList> @@ -21,7 +25,12 @@ * Runs the iPhoneSimulator backed by a main runloop. */ int main (int argc, char *argv[]) { +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) + QApplication a(argc, argv); +#else QGuiApplication a(argc, argv); +#endif + //NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; |