diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-06-01 20:04:22 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-10-01 16:19:36 +0000 |
| commit | 5df87614e388640a4717ffcfeb478cc57575dd4e (patch) | |
| tree | 61c2c7ecc2ccfedc726a58ea6448b252abf36709 /qmake/generators/win32/mingw_make.cpp | |
| parent | cbbeed519b8bd98de71bd93c51c682f9d11158bd (diff) | |
remove link_highest_lib_version misfeature
in retrospect, we were too conservative in 925fd32a2d8f making the
"feature" optional - it simply makes no sense to have qmake
automatically find the highest major (!) version of a library based on
a loosely defined platform-specific convention (not standard, unlike
ELF's .so versioning) with side effects.
Change-Id: Iba92df433b199a9fbff88358f6e0f6835f2e813d
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'qmake/generators/win32/mingw_make.cpp')
| -rw-r--r-- | qmake/generators/win32/mingw_make.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp index 88a4494ec4..70b2e8325b 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp @@ -82,7 +82,7 @@ bool MingwMakefileGenerator::findLibraries() QString suffix = project->first(ProKey("QMAKE_" + steam.toUpper() + "_SUFFIX")).toQString(); for (QList<QMakeLocalFileName>::Iterator dir_it = dirs.begin(); dir_it != dirs.end(); ++dir_it) { QString extension; - int ver = findHighestVersion((*dir_it).local(), steam, "dll.a|a"); + int ver = findHighestVersion((*dir_it).local(), steam); if (ver > 0) extension += QString::number(ver); extension += suffix; |