diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-09-25 14:21:51 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-10-02 14:01:30 +0000 |
| commit | 8be1c3fae88c265fb3955e14c453ebf4b4e19275 (patch) | |
| tree | 416d1b7792e612280e95ae6cd24296e29ee37e98 /mkspecs/features | |
| parent | 4bb004de94380304d8950e860d1823975927ec59 (diff) | |
remove now superfluous QMAKE_*_VERSION_OVERRIDEs
these were necessary to suppress the appending of the qt major version
to the library name when reading .prl files. this has outlived its
usefulness, as the .prl files now contain the full library name.
additionally, the overrides would break the use of qt if the .prl files
were not shipped, as zero lost its special meaning as "none".
Change-Id: I9f028c17fc0428cb546a4a26ee209febff32da5e
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/qt.prf | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index a8d317a0e3..d416a8955a 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -119,12 +119,6 @@ for(ever) { !mac|!contains(MODULE_CONFIG, lib_bundle): \ MODULE_NAME ~= s,^Qt,Qt$$QT_MAJOR_VERSION, - win32 { - # Make sure the version number isn't appended again to the lib name - QMAKE_$${upper($$MODULE_NAME$$QT_LIBINFIX)}_VERSION_OVERRIDE = 0 - QMAKE_$${upper($$MODULE_NAME$$QT_LIBINFIX)}D_VERSION_OVERRIDE = 0 - } - isEmpty(LINKAGE) { !isEmpty(MODULE_LIBS_ADD): \ LINKAGE = -L$$MODULE_LIBS_ADD |