diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-29 16:45:15 +0200 |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-09-10 14:30:50 +0200 |
| commit | 7ef2f9f65cc8e358f8d97af19a6a6d595c924f00 (patch) | |
| tree | d702de18f3547756da07ae79afee07c536f555f9 /mkspecs | |
| parent | a56cfad51a0ee5526536a6b2d4f3042ff8b00e86 (diff) | |
| download | qtbase-7ef2f9f65cc8e358f8d97af19a6a6d595c924f00.tar.gz | |
Use Qt's major version in the library prefix
This follows the discussion at:
http://lists.qt-project.org/pipermail/development/2014-June/017225.html
Qt WebEngine will have a version of 1.0 when released with Qt 5.4.
The library name is currently libQt1WebEngine.so.1.0.0 but it should
rather be libQt5WebEngine.so.1.0.0 to represent Qt's major version
releases as a whole and not the major version of the module. This
prefix essentially expresses the module's dynamic linking
compatibility with other Qt modules.
This only makes sense if each major module release will be compatible
with a single Qt major version only.
All published modules currently already have 5 as their major version,
except qtenginio which doesn't use a Qt prefix, so this change has no
effect except for qtwebengine.
Task-number: QTBUG-30910
Change-Id: I894e7a367624c7fc263cf08104173a82eafd1439
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 8 | ||||
| -rw-r--r-- | mkspecs/features/qt_module.prf | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 9a4d80e80f..709248ac1d 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -19,10 +19,9 @@ defineReplace(qtLibraryTarget) { QMAKE_FRAMEWORK_BUNDLE_NAME = $$LIBRARY_NAME export(QMAKE_FRAMEWORK_BUNDLE_NAME) } else { - # insert the major version in the library name + # insert the major version of Qt in the library name # unless it's a framework build - MAJOR_VERSION = $$section(VERSION, ., 0, 0) - LIBRARY_NAME ~= s,^Qt,Qt$$MAJOR_VERSION, + LIBRARY_NAME ~= s,^Qt,Qt$$QT_MAJOR_VERSION, } return($$LIBRARY_NAME$$qtPlatformTargetSuffix()) } @@ -64,7 +63,6 @@ defineTest(qtAddModule) { MODULE_INCLUDES = $$eval(QT.$${1}.includes) MODULE_LIBS = $$eval(QT.$${1}.libs) MODULE_CONFIG = $$eval(QT.$${1}.module_config) - MODULE_MAJOR_VERSION = $$eval(QT.$${1}.MAJOR_VERSION) contains(MODULE_CONFIG, internal_module) { using_privates = true @@ -104,7 +102,7 @@ defineTest(qtAddModule) { # Re-insert the major version in the library name (cf qtLibraryTarget above) # unless it's a framework build !mac|!contains(MODULE_CONFIG, lib_bundle): \ - MODULE_NAME ~= s,^Qt,Qt$$MODULE_MAJOR_VERSION, + MODULE_NAME ~= s,^Qt,Qt$$QT_MAJOR_VERSION, win32 { # Make sure the version number isn't appended again to the lib name diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index 8bf4c92cdd..6ab826771d 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -180,8 +180,8 @@ unix|mingw { QMAKE_PKGCONFIG_LIBDIR = $$qt_libdir QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw] QMAKE_PKGCONFIG_CFLAGS = -I${includedir}/$$MODULE_INCNAME - QMAKE_PKGCONFIG_NAME = $$replace(TARGET, ^Qt, "Qt$$section(VERSION, ., 0, 0) ") - QMAKE_PKGCONFIG_FILE = $$replace(TARGET, ^Qt, Qt$$section(VERSION, ., 0, 0)) + QMAKE_PKGCONFIG_NAME = $$replace(TARGET, ^Qt, "Qt$$QT_MAJOR_VERSION ") + QMAKE_PKGCONFIG_FILE = $$replace(TARGET, ^Qt, Qt$$QT_MAJOR_VERSION) for(i, MODULE_DEPENDS): \ QMAKE_PKGCONFIG_REQUIRES += $$replace(QT.$${i}.name, ^Qt, Qt$$eval(QT.$${i}.MAJOR_VERSION)) isEmpty(QMAKE_PKGCONFIG_DESCRIPTION): \ |