diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-23 19:17:25 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-11-23 19:17:25 +0000 |
| commit | 746f54c6df0b6c08126b02ddc19e9e3010cb0d2d (patch) | |
| tree | 0b50efabfdc1ea8acd61521fa6d2234effe3a1a9 /mkspecs/features/qt_module.prf | |
| parent | 550fbf96b06bc9194388ccdae1a9e6116d959599 (diff) | |
| parent | 1ed7a67a4cef8350103e4ea33b4bbd084f5d4c2d (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev
Diffstat (limited to 'mkspecs/features/qt_module.prf')
| -rw-r--r-- | mkspecs/features/qt_module.prf | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index 663bddffb0..e2e56c318f 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -42,8 +42,8 @@ host_build { } } -mac:CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework): \ - CONFIG += qt_framework +CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework): \ + CONFIG += lib_bundle CONFIG += relative_qt_rpath # Qt libraries should be relocatable @@ -106,7 +106,7 @@ else: \ DEFINES += QT_BUILD_$${ucmodule}_LIB # OS X and iOS frameworks -qt_framework { +lib_bundle { # Set the CFBundleIdentifier prefix for Qt frameworks QMAKE_TARGET_BUNDLE_PREFIX = org.qt-project #QMAKE_FRAMEWORK_VERSION = 4.0 @@ -115,8 +115,6 @@ qt_framework { CONFIG += bundle QMAKE_BUNDLE_EXTENSION = .framework QMAKE_INFO_PLIST = $$QMAKESPEC/Info.plist.lib - } else { - CONFIG += lib_bundle } CONFIG -= qt_install_headers #no need to install these as well !debug_and_release|!build_all|CONFIG(release, debug|release) { @@ -239,7 +237,7 @@ load(qt_installs) load(qt_targets) # this builds on top of qt_common -!internal_module:!qt_framework:if(unix|mingw) { +!internal_module:!lib_bundle:if(unix|mingw) { CONFIG += create_pc QMAKE_PKGCONFIG_DESTDIR = pkgconfig host_build: \ |