From 67289d0dfa64bf805c7ff2e455611affaea28558 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 25 Feb 2015 16:00:58 +0100 Subject: restore qt4's qtLibraryTarget() behavior the function is used in our examples and code generated by qt-creator, so the qt5-specific magic behavior is inappropriate. create a separate function instead. Task-number: QTBUG-44595 Change-Id: I4d72cc1e5cbfc274b3210520baa213f4c5479ca9 Reviewed-by: Thiago Macieira --- mkspecs/features/qt_functions.prf | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'mkspecs/features/qt_functions.prf') diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 7961f6512a..79b4eab949 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, -- cgit v1.2.3