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>
bb10
parent
d616915b0a
commit
925fd32a2d
|
|
@ -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 *
|
||||
****************************************************************************
|
||||
|
|
|
|||
|
|
@ -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()) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue