1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up QT_QPA_DEFAULT_PLATFORM handling

Browse Source 
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>
This commit is contained in:
Jake Petroules 2016-09-30 08:43:50 -07:00
parent fd7e00aff5
commit 12bc984f65
6 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mkspecs/android-clang/qplatformdefs.h
View File

@ -34,8 +34,6 @@
#ifndef QPLATFORMDEFS_H #ifndef QPLATFORMDEFS_H
#define QPLATFORMDEFS_H #define QPLATFORMDEFS_H
#define QT_QPA_DEFAULT_PLATFORM_NAME "android"
// Get Qt defines/settings // Get Qt defines/settings
#include "qglobal.h" #include "qglobal.h"

2
mkspecs/android-g++/qplatformdefs.h
View File

@ -40,8 +40,6 @@
#ifndef QPLATFORMDEFS_H #ifndef QPLATFORMDEFS_H
#define QPLATFORMDEFS_H #define QPLATFORMDEFS_H
#define QT_QPA_DEFAULT_PLATFORM_NAME "android"
// Get Qt defines/settings // Get Qt defines/settings
#include "qglobal.h" #include "qglobal.h"

2
mkspecs/common/ios/qmake.conf
View File

@ -2,8 +2,6 @@
# Common build settings for all iOS configurations # Common build settings for all iOS configurations
# #
QT_QPA_DEFAULT_PLATFORM = ios
QMAKE_XCODE_CODE_SIGN_IDENTITY = "iPhone Developer" QMAKE_XCODE_CODE_SIGN_IDENTITY = "iPhone Developer"
# iOS build tools # iOS build tools

3
mkspecs/common/qcc-base-qnx.conf
View File

@ -6,9 +6,6 @@ include(qcc-base.conf)
QMAKE_PLATFORM = qnx $$QMAKE_PLATFORM QMAKE_PLATFORM = qnx $$QMAKE_PLATFORM
#Choose qnx QPA Plugin as default
QT_QPA_DEFAULT_PLATFORM = qnx
QMAKE_LFLAGS_SHLIB += -shared QMAKE_LFLAGS_SHLIB += -shared
QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB
QMAKE_LFLAGS_SONAME += -Wl,-soname, QMAKE_LFLAGS_SONAME += -Wl,-soname,

3
mkspecs/haiku-g++/qmake.conf
View File

@ -7,9 +7,6 @@ QMAKE_PLATFORM = haiku
include(../common/unix.conf) include(../common/unix.conf)
# Choose haiku QPA Plugin as default
QT_QPA_DEFAULT_PLATFORM = haiku
QMAKE_LIBS = QMAKE_LIBS =
QMAKE_INCDIR = QMAKE_INCDIR =
QMAKE_LIBDIR = QMAKE_LIBDIR =

4
src/gui/configure.pri
View File

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