diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-01 08:25:15 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-07 23:35:20 +0200 |
| commit | 2e10b38c6a4d1025335e3a3b095f0cd45870d8c5 (patch) | |
| tree | 8586c8921d991e10c37e635016d1576cfeedd6ca | |
| parent | 3bd2c690f4624d933e5f5679ea1ee905cbe1f398 (diff) | |
use each module's lib_bundle setting
... instead of relying on the global qt_framework flag.
Change-Id: Ie23f55788c26d732ada87aab7284c0a1fe0bfa28
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 724d0276ae..3b1a8d2783 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -56,7 +56,7 @@ defineTest(qtAddModule) { unset(LINKAGE) mac { - !contains(MODULE_CONFIG,staticlib):CONFIG(qt_framework, qt_framework|qt_no_framework) { #forced + contains(MODULE_CONFIG, lib_bundle) { FRAMEWORK_INCLUDE = $${MODULE_LIBS}/$${MODULE_NAME}.framework/Headers !qt_no_framework_direct_includes:exists($$FRAMEWORK_INCLUDE) { INCLUDEPATH *= $$FRAMEWORK_INCLUDE |