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 <[email protected]>
chain78 · Oct 5, 2016 · 12bc984 · 12bc984
1 parent fd7e00a
commit 12bc984
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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            =

diff --git a/src/gui/configure.pri b/src/gui/configure.pri
@@ -65,9 +65,11 @@ defineTest(qtConfTest_qpaDefaultPlatform) {
     else: win32: name = windows
     else: android: name = android
     else: macos: name = cocoa
-    else: ios: name = ios
+    else: if(ios|tvos): name = ios
+    else: watchos: name = minimal
     else: qnx: name = qnx
     else: integrity: name = integrityfb
+    else: haiku: name = haiku
     else: name = xcb
 
     $${1}.value = $$name