diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-10-08 18:17:26 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-10-12 18:06:49 +0000 |
| commit | 473d9a5fc763d114fbfa1c0d2b5f8d03cab6e972 (patch) | |
| tree | 64dc4744d8260ec3edcd05a7d151b318ce690749 /qmake/generators/unix/unixmake.h | |
| parent | 342b13944c8b4210ab44760dad9ab289e2a89499 (diff) | |
qmake: fix the precedence of QMAKE_LIBDIR_POSTv5.12.0-beta2
it must end up in front of QMAKE_LIBS{,_PRIVATE}, but not of
LIBS{,_PRIVATE} (which are preceded by QMAKE_LIBDIR).
Task-number: QTBUG-61982
Started-by: Liang Qi <liang.qi@qt.io>
Change-Id: Id3de01ee0e9b66af02f79949aeb5a0eabd55363f
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'qmake/generators/unix/unixmake.h')
| -rw-r--r-- | qmake/generators/unix/unixmake.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/qmake/generators/unix/unixmake.h b/qmake/generators/unix/unixmake.h index c5e42aa1ae..5b0766855b 100644 --- a/qmake/generators/unix/unixmake.h +++ b/qmake/generators/unix/unixmake.h @@ -66,6 +66,7 @@ protected: private: void init2(); + ProStringList libdirToFlags(const ProKey &key); }; inline UnixMakefileGenerator::~UnixMakefileGenerator() |