From 66f30105ef15579c13b5574cc11bbe49f1615f41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= <morten.sorvig@nokia.com>
Date: Fri, 25 Feb 2011 09:16:20 +0100
Subject: Fix CoreServices framework addition for qpa.

Test against the coreservices QT_CONFIG on qpa,
unconditionally add CoreFoundation for mac and
darwin
---
 src/corelib/corelib.pro | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'src/corelib/corelib.pro')

diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro
index f03550dfe1..58d2c7b2c6 100644
--- a/src/corelib/corelib.pro
+++ b/src/corelib/corelib.pro
@@ -20,14 +20,13 @@ include(statemachine/statemachine.pri)
 include(xml/xml.pri)
 
 !qpa:mac|darwin:LIBS_PRIVATE += -framework ApplicationServices
-qpa:mac|darwin {
-  contains(QT_CONFIG, coreservices) {
-    LIBS_PRIVATE += -framework CoreServices
-  } else {
-    LIBS_PRIVATE += -framework CoreFoundation
-  }
+qpa {
+    contains(QT_CONFIG, coreservices) {
+        LIBS_PRIVATE += -framework CoreServices
+    }
+} else:mac|darwin {
+        LIBS_PRIVATE += -framework CoreFoundation
 }
-
 mac:lib_bundle:DEFINES += QT_NO_DEBUG_PLUGIN_CHECK
 win32:DEFINES-=QT_NO_CAST_TO_ASCII
 
-- 
cgit v1.2.3