diff options
| -rw-r--r-- | dist/changes-5.1.0 | 11 | ||||
| -rw-r--r-- | qmake/generators/win32/winmakefile.cpp | 2 |
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()) { |