summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@digia.com>2013-03-15 16:53:47 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-26 21:44:15 +0100
commit925fd32a2d8fc6563ab5318344a223bbe6d686d9 (patch)
treec88d20de45bda3bef6c3168a3c8feae4803ef9c6
parentd616915b0ab346c7e3e6944605e5822afd743f73 (diff)
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 <oswald.buddenhagen@digia.com>
-rw-r--r--dist/changes-5.1.011
-rw-r--r--qmake/generators/win32/winmakefile.cpp2
2 files changed, 12 insertions, 1 deletions
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
@@ -123,6 +123,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<QString, QStringList> dirEntryListCache;
QStringList entries = dirEntryListCache.value(bd);
if (entries.isEmpty()) {