diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-09-30 08:43:50 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-10-05 19:07:30 +0000 |
| commit | 12bc984f653a06fcc87d5d5615c976f6e3d1a080 (patch) | |
| tree | 832552d3efadb3b16fc0b536c22029406c38cc96 /mkspecs | |
| parent | fd7e00aff50c9ced966004238b2f74672dbbe300 (diff) | |
Clean up QT_QPA_DEFAULT_PLATFORM handling
This is now centralized in configure.pri except where it explicitly
needs to be overridden.
Change-Id: If829d6b5eecf9a5fc403d0a0600d12c9e5781525
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/android-clang/qplatformdefs.h | 2 | ||||
| -rw-r--r-- | mkspecs/android-g++/qplatformdefs.h | 2 | ||||
| -rw-r--r-- | mkspecs/common/ios/qmake.conf | 2 | ||||
| -rw-r--r-- | mkspecs/common/qcc-base-qnx.conf | 3 | ||||
| -rw-r--r-- | mkspecs/haiku-g++/qmake.conf | 3 |
5 files changed, 0 insertions, 12 deletions
diff --git a/mkspecs/android-clang/qplatformdefs.h b/mkspecs/android-clang/qplatformdefs.h index 9d3820fa27..9a8d176285 100644 --- a/mkspecs/android-clang/qplatformdefs.h +++ b/mkspecs/android-clang/qplatformdefs.h @@ -34,8 +34,6 @@ #ifndef QPLATFORMDEFS_H #define QPLATFORMDEFS_H -#define QT_QPA_DEFAULT_PLATFORM_NAME "android" - // Get Qt defines/settings #include "qglobal.h" diff --git a/mkspecs/android-g++/qplatformdefs.h b/mkspecs/android-g++/qplatformdefs.h index 1d4fa2ba5b..068f437c11 100644 --- a/mkspecs/android-g++/qplatformdefs.h +++ b/mkspecs/android-g++/qplatformdefs.h @@ -40,8 +40,6 @@ #ifndef QPLATFORMDEFS_H #define QPLATFORMDEFS_H -#define QT_QPA_DEFAULT_PLATFORM_NAME "android" - // Get Qt defines/settings #include "qglobal.h" diff --git a/mkspecs/common/ios/qmake.conf b/mkspecs/common/ios/qmake.conf index daf66ac5ea..b579562236 100644 --- a/mkspecs/common/ios/qmake.conf +++ b/mkspecs/common/ios/qmake.conf @@ -2,8 +2,6 @@ # Common build settings for all iOS configurations # -QT_QPA_DEFAULT_PLATFORM = ios - QMAKE_XCODE_CODE_SIGN_IDENTITY = "iPhone Developer" # iOS build tools diff --git a/mkspecs/common/qcc-base-qnx.conf b/mkspecs/common/qcc-base-qnx.conf index 7101435cb5..624bdd3656 100644 --- a/mkspecs/common/qcc-base-qnx.conf +++ b/mkspecs/common/qcc-base-qnx.conf @@ -6,9 +6,6 @@ include(qcc-base.conf) QMAKE_PLATFORM = qnx $$QMAKE_PLATFORM -#Choose qnx QPA Plugin as default -QT_QPA_DEFAULT_PLATFORM = qnx - QMAKE_LFLAGS_SHLIB += -shared QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME += -Wl,-soname, diff --git a/mkspecs/haiku-g++/qmake.conf b/mkspecs/haiku-g++/qmake.conf index ac28069864..6a7d080ec3 100644 --- a/mkspecs/haiku-g++/qmake.conf +++ b/mkspecs/haiku-g++/qmake.conf @@ -7,9 +7,6 @@ QMAKE_PLATFORM = haiku include(../common/unix.conf) -# Choose haiku QPA Plugin as default -QT_QPA_DEFAULT_PLATFORM = haiku - QMAKE_LIBS = QMAKE_INCDIR = QMAKE_LIBDIR = |