whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iOS: Build ios platform plugin when appropriate 

Defining QT_QPA_DEFAULT_PLATFORM_NAME in qplatformdefs.h is not
neccecary, as qconfig.h will already have this define written by
configure.

Change-Id: I89d9191533f6b4e6bfd5eade6cc0dced02b50f81
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
bb10
Tor Arne Vestbø 2012-11-01 16:11:35 +01:00
parent a6286039ba
commit e5111d5e02
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,8 @@
#
# QMAKE_XCODE_DEVELOPER_PATH - set in mkspecs/common/xcode.conf
QT_QPA_DEFAULT_PLATFORM = ios
QMAKE_XCODE_TOOLCHAIN_BIN_PATH = $$QMAKE_XCODE_DEVELOPER_PATH/Toolchains/XcodeDefault.xctoolchain/usr/bin
QMAKE_XCODE_CODE_SIGN_IDENTITY = "iPhone Developer"

2
mkspecs/common/mac/qplatformdefs.h
View File

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

5
src/plugins/platforms/platforms.pro
View File

@ -6,7 +6,10 @@ contains(QT_CONFIG, xcb) {
SUBDIRS += xcb
}
mac:!ios: SUBDIRS += cocoa
mac {
ios: SUBDIRS += ios
else: SUBDIRS += cocoa
}
win32: SUBDIRS += windows