diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-16 17:28:22 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-31 12:57:09 +0000 |
| commit | 6dcd944deeed28bdd001eea5289d04116c9d23f4 (patch) | |
| tree | 3fa34c02e01e0eff28927f3c1da8f2b63aeb4c89 /qmake/generators | |
| parent | 27f0d8db9112cebd6ca54f8709e80d03f3e23aaf (diff) | |
make mkspecs not mess up library and include search paths
adding shared install paths to QMAKE_{INCDIR,LIBDIR} in the spec has the
tiny side effect that they are searched _first_, which is generally a
really bad idea - they should be _last_.
for that purpose, make QMAKE_{INCDIR,LIBDIR}_POST live up to their names
(i.e., search them actually last) and migrate all affected specs to use
them.
Task-number: QTBUG-40825
Change-Id: Ie0de81c3cc49e193186d2fedd7d6c77590c8ef79
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'qmake/generators')
| -rw-r--r-- | qmake/generators/unix/unixmake.cpp | 2 | ||||
| -rw-r--r-- | qmake/generators/win32/winmakefile.cpp | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index b86594d191..2f1bbeea25 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -94,6 +94,8 @@ UnixMakefileGenerator::init() !project->values("QMAKE_LIB_FLAG").isEmpty() && project->isActiveConfig("dll")) project->values("QMAKE_LFLAGS") += project->values("QMAKE_LFLAGS_PREBIND"); + project->values("QMAKE_INCDIR") += project->values("QMAKE_INCDIR_POST"); + project->values("QMAKE_LIBDIR") += project->values("QMAKE_LIBDIR_POST"); if(!project->isEmpty("QMAKE_INCDIR")) project->values("INCLUDEPATH") += project->values("QMAKE_INCDIR"); ProStringList ldadd; diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index 6f2f43c03c..75bb5d236d 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -174,6 +174,9 @@ void Win32MakefileGenerator::processVars() else if (project->first("TEMPLATE").startsWith("vc")) project->values("MAKEFILE") = project->values("QMAKE_PROJECT_NAME"); + project->values("QMAKE_INCDIR") += project->values("QMAKE_INCDIR_POST"); + project->values("QMAKE_LIBDIR") += project->values("QMAKE_LIBDIR_POST"); + if (!project->values("QMAKE_INCDIR").isEmpty()) project->values("INCLUDEPATH") += project->values("QMAKE_INCDIR"); |