summaryrefslogtreecommitdiffstats
path: root/tools/qmake/mkspecs
diff options
context:
space:
mode:
authorZoltan Arvai <zarvai@inf.u-szeged.hu>2014-01-13 17:59:39 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-13 21:31:51 +0100
commit2ef0c82b8d083790b47119d4f55127323c301fc3 (patch)
tree058597d3d390db1488c85301309ffe5ef6894c79 /tools/qmake/mkspecs
parent36623478c63110bd41326d1a0425b0f331db96ac (diff)
Fix Qt5 libs linking to Qt5WebEngineCore.dll for Windows
MSVC linker needs file extension, otherwise it searches for .obj files, but Qt has Qt5*.lib files. Change-Id: I4fd5e1d6001ea309da456c43ffc79cb5944a1ef3 Reviewed-by: Andras Becsi <andras.becsi@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Diffstat (limited to 'tools/qmake/mkspecs')
-rw-r--r--tools/qmake/mkspecs/features/gyp_generator.prf3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/qmake/mkspecs/features/gyp_generator.prf b/tools/qmake/mkspecs/features/gyp_generator.prf
index e41b2de50..4a4a8106d 100644
--- a/tools/qmake/mkspecs/features/gyp_generator.prf
+++ b/tools/qmake/mkspecs/features/gyp_generator.prf
@@ -94,7 +94,8 @@ GYP_CONTENTS += " ],"
}
GYP_CONTENTS += " 'link_settings': {" \
" 'libraries': ["
-for (library, LIBRARIES): GYP_CONTENTS += " '$$library',"
+win32: for (library, LIBRARIES): GYP_CONTENTS += " '$${library}.lib',"
+else: for (library, LIBRARIES): GYP_CONTENTS += " '$$library',"
macx {
FRAMEWORKS = $$find(LIBS, "Q*")
FRAMEWORKS = $$unique(FRAMEWORKS)