From e5111d5e021e8168fa9deb00abae5c403a5313e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@digia.com>
Date: Thu, 1 Nov 2012 16:11:35 +0100
Subject: iOS: Build ios platform plugin when appropriate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/plugins/platforms/platforms.pro | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/plugins')

diff --git a/src/plugins/platforms/platforms.pro b/src/plugins/platforms/platforms.pro
index 173757568f..a60a3626fa 100644
--- a/src/plugins/platforms/platforms.pro
+++ b/src/plugins/platforms/platforms.pro
@@ -6,7 +6,10 @@ contains(QT_CONFIG, xcb) {
     SUBDIRS += xcb
 }
 
-mac:!ios: SUBDIRS += cocoa
+mac {
+    ios: SUBDIRS += ios
+    else: SUBDIRS += cocoa
+}
 
 win32: SUBDIRS += windows
 
-- 
cgit v1.2.3