diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-08 06:52:22 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-04-08 06:52:22 +0000 |
commit | 4cee9928f25926581c5bfcffeb648d89e0b232ec (patch) | |
tree | e4b3d5109b177a607c2275ed4729ea0a23e0d45c /mkspecs/features/qt_functions.prf | |
parent | 0d4232f53100eb04f8aa85ea2a7aee395baf337f (diff) | |
parent | 20cac3d9c9c22153e9e316daff32b6050ff6be6b (diff) |
Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev
Diffstat (limited to 'mkspecs/features/qt_functions.prf')
-rw-r--r-- | mkspecs/features/qt_functions.prf | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 89870f4f51..78be2e8473 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -18,14 +18,20 @@ defineReplace(qtLibraryTarget) { mac:CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework) { QMAKE_FRAMEWORK_BUNDLE_NAME = $$LIBRARY_NAME export(QMAKE_FRAMEWORK_BUNDLE_NAME) - } else { - # insert the major version of Qt in the library name - # unless it's a framework build - LIBRARY_NAME ~= s,^Qt,Qt$$QT_MAJOR_VERSION, } return($$LIBRARY_NAME$$qtPlatformTargetSuffix()) } +defineReplace(qt5LibraryTarget) { + LIBRARY_NAME = $$qtLibraryTarget($$1) + isEmpty(QMAKE_FRAMEWORK_BUNDLE_NAME) { + # Insert the major version of Qt in the library name + # unless it's a framework build. + LIBRARY_NAME ~= s,^Qt,Qt$$QT_MAJOR_VERSION, + } + return($$LIBRARY_NAME) +} + defineTest(qtAddLibrary) { warning("qtAddLibrary() is deprecated. Use QT+= instead.") @@ -100,7 +106,7 @@ defineTest(qtAddModule) { # to give access to sources or include files, and not for linking. !isEmpty(MODULE_LIBS):!contains(MODULE_CONFIG, no_link) { - # Re-insert the major version in the library name (cf qtLibraryTarget above) + # Re-insert the major version in the library name (cf qt5LibraryTarget above) # unless it's a framework build !mac|!contains(MODULE_CONFIG, lib_bundle): \ MODULE_NAME ~= s,^Qt,Qt$$QT_MAJOR_VERSION, |