diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-03-02 15:46:37 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-05 20:59:45 +0100 |
| commit | d28073d9eb0f35bae534470970e693a94463c549 (patch) | |
| tree | d3331dc068105893fecd93868dd078d1ea57edaf /src/plugins | |
| parent | 950b35cf97ad398f97883efd2a18ee97994a8a9c (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 <oswald.buddenhagen@digia.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/bearer/bearer.pro | 4 | ||||
| -rw-r--r-- | src/plugins/platforminputcontexts/platforminputcontexts.pro | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/bearer/bearer.pro b/src/plugins/bearer/bearer.pro index 0375500306..42f039b19b 100644 --- a/src/plugins/bearer/bearer.pro +++ b/src/plugins/bearer/bearer.pro @@ -9,7 +9,7 @@ linux*:qtHaveModule(dbus) { win32:SUBDIRS += generic blackberry:SUBDIRS += blackberry win32:!wince*:SUBDIRS += nativewifi -macx:contains(QT_CONFIG, corewlan):SUBDIRS += corewlan -macx:SUBDIRS += generic +mac:contains(QT_CONFIG, corewlan):SUBDIRS += corewlan +mac:SUBDIRS += generic isEmpty(SUBDIRS):SUBDIRS = generic diff --git a/src/plugins/platforminputcontexts/platforminputcontexts.pro b/src/plugins/platforminputcontexts/platforminputcontexts.pro index c8449e7e44..7b3c6e9c36 100644 --- a/src/plugins/platforminputcontexts/platforminputcontexts.pro +++ b/src/plugins/platforminputcontexts/platforminputcontexts.pro @@ -1,4 +1,4 @@ TEMPLATE = subdirs qtHaveModule(dbus) { -!macx:!win32:SUBDIRS += ibus maliit +!mac:!win32:SUBDIRS += ibus maliit } |