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.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.prf')
| -rw-r--r-- | mkspecs/features/qt.prf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 4ef93af2e9..c041c306c1 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -89,7 +89,7 @@ for(ever) { MODULE_LIBS_ADD -= $$QMAKE_DEFAULT_LIBDIRS LINKAGE = - mac:contains(MODULE_CONFIG, lib_bundle) { + contains(MODULE_CONFIG, lib_bundle) { FRAMEWORK_INCLUDE = $${MODULE_LIBS}/$${MODULE_NAME}.framework/Headers !qt_no_framework_direct_includes { INCLUDEPATH *= $$FRAMEWORK_INCLUDE @@ -111,7 +111,7 @@ for(ever) { # Re-insert the major version in the library name (cf qt5LibraryTarget above) # unless it's a framework build - !mac|!contains(MODULE_CONFIG, lib_bundle): \ + !contains(MODULE_CONFIG, lib_bundle): \ MODULE_NAME ~= s,^Qt,Qt$$QT_MAJOR_VERSION, isEmpty(LINKAGE) { |