path: root/src/plugins/platforminputcontexts
diff options
authorTor Arne Vestbø <>2013-03-02 15:46:37 +0100
committerThe Qt Project <>2013-03-05 20:59:45 +0100
commitd28073d9eb0f35bae534470970e693a94463c549 (patch)
treed3331dc068105893fecd93868dd078d1ea57edaf /src/plugins/platforminputcontexts
parent950b35cf97ad398f97883efd2a18ee97994a8a9c (diff)
Distinguish between 'mac' and 'macx' qmake scopes
The former applies both on Mac OS X and iOS, but 'macx' is specific to Mac OS X. ios.conf and macx.conf now share most of their settings in the common mac.conf. We set the default QMAKE_MAC_SDK before loading mac.conf, so that any overrides in the device config will apply afterwards. This means configure's mkspec parsing will be able to read the QMAKE_MAC_SDK. Change-Id: I0c7e26a6a0103e19b23ef152aa9e4ab461cee632 Reviewed-by: Oswald Buddenhagen <> Reviewed-by: Richard Moe Gustavsen <>
Diffstat (limited to 'src/plugins/platforminputcontexts')
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforminputcontexts/ b/src/plugins/platforminputcontexts/
index c8449e7e44..7b3c6e9c36 100644
--- a/src/plugins/platforminputcontexts/
+++ b/src/plugins/platforminputcontexts/
@@ -1,4 +1,4 @@
TEMPLATE = subdirs
qtHaveModule(dbus) {
-!macx:!win32:SUBDIRS += ibus maliit
+!mac:!win32:SUBDIRS += ibus maliit