diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-04-29 19:24:00 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-30 16:56:50 +0200 |
| commit | 5c05534a63f3ce97530b3827533ba9a0f4e2d57c (patch) | |
| tree | 6731f2b58543fe8f7c535335805a10c2a1ec65c5 | |
| parent | bc563a02b2a7fde1f93c1746a1de3a4ab749e763 (diff) | |
fix qtmain's .prl file not being used
at some point we stopped adding the qtmain's library path before its
respective -l flag, which lead to qmake being unable to resolve the
library location and thus ignoring its prl file.
Change-Id: I390a31f8ac2877d3823dfd2787b2cc8c696b0ec0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| -rw-r--r-- | mkspecs/features/win32/windows.prf | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mkspecs/features/win32/windows.prf b/mkspecs/features/win32/windows.prf index 6d8289d949..f19a42b7e2 100644 --- a/mkspecs/features/win32/windows.prf +++ b/mkspecs/features/win32/windows.prf @@ -7,6 +7,8 @@ contains(TEMPLATE, ".*app"){ qt:for(entryLib, $$list($$unique(QMAKE_LIBS_QT_ENTRY))) { isEqual(entryLib, -lqtmain): { + !contains(QMAKE_DEFAULT_LIBDIRS, $$QT.core.libs): \ + QMAKE_LIBS += -L$$QT.core.libs CONFIG(debug, debug|release): QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX}d else: QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX} } else { |