diff options
| author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2011-02-25 08:16:20 (GMT) |
|---|---|---|
| committer | Morten Sorvig <msorvig@trolltech.com> | 2011-03-16 08:08:59 (GMT) |
| commit | 66f30105ef15579c13b5574cc11bbe49f1615f41 (patch) | |
| tree | f867f98e802e67ad52e46a6617d34fa278c4b658 /src | |
| parent | f58fea162bf20ba42c57a7bf81d0b4de9cbae725 (diff) | |
| download | Qt-66f30105ef15579c13b5574cc11bbe49f1615f41.zip Qt-66f30105ef15579c13b5574cc11bbe49f1615f41.tar.gz Qt-66f30105ef15579c13b5574cc11bbe49f1615f41.tar.bz2 | |
Fix CoreServices framework addition for qpa.
Test against the coreservices QT_CONFIG on qpa,
unconditionally add CoreFoundation for mac and
darwin
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/corelib.pro | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index f03550d..58d2c7b 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 |