From 925fd32a2d8fc6563ab5318344a223bbe6d686d9 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 15 Mar 2013 16:53:47 +0100 Subject: qmake/Win: disable "find highest lib version" feature by default The undocumented feature of linking the library with the highest version number is more confusing than helpful. We're changing the default from on to off now. Users who still need this feature can turn it on with: CONFIG += link_highest_lib_version Task-number: QTBUG-15596 Change-Id: Ic998c1685003caa6f57e27dccf83c8b4a2a09553 Reviewed-by: Oswald Buddenhagen --- dist/changes-5.1.0 | 11 +++++++++++ qmake/generators/win32/winmakefile.cpp | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dist/changes-5.1.0 b/dist/changes-5.1.0 index c9fdba2685..d89914ce1a 100644 --- a/dist/changes-5.1.0 +++ b/dist/changes-5.1.0 @@ -122,6 +122,17 @@ Qt for Windows CE **************************************************************************** +**************************************************************************** +* Tools * +**************************************************************************** + +- qmake + + * Windows: The feature of finding the highest version number of LIBS + entries is turned off by default. + It can be turned on with "CONFIG += link_highest_lib_version". + + **************************************************************************** * Plugins * **************************************************************************** diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index c6a70c7539..08674a323c 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -77,7 +77,7 @@ Win32MakefileGenerator::findHighestVersion(const QString &d, const QString &stem return vover.first().toInt(); int biggest=-1; - if(!project->isActiveConfig("no_versionlink")) { + if (project->isActiveConfig("link_highest_lib_version")) { static QHash dirEntryListCache; QStringList entries = dirEntryListCache.value(bd); if (entries.isEmpty()) { -- cgit v1.2.3