1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qmake/Win: disable "find highest lib version" feature by default

Browse Source 
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>
This commit is contained in:
Joerg Bornemann 2013-03-15 16:53:47 +01:00 committed by The Qt Project
parent d616915b0a
commit 925fd32a2d
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dist/changes-5.1.0 vendored
View File

@ -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 *
****************************************************************************

2
qmake/generators/win32/winmakefile.cpp
View File

@ -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()) {