feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix linking of the core plugin on Windows.

Browse Source 
DestroyIcon needs user32.dll.

Introduced by e0f16c3093 .

Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
(cherry picked from commit 506df46f0b)

Change-Id: I11075c9cb911af403cb5ded74437c5a785fb768c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
This commit is contained in:
Friedemann Kleint
2012-07-30 12:27:11 +02:00
committed by Daniel Molkentin
parent 98f3bd2930
commit 6441d5f214
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/coreplugin/coreplugin.pro
View File

@@ -210,7 +210,7 @@ RESOURCES += core.qrc \
win32 { win32 {
SOURCES += progressmanager/progressmanager_win.cpp SOURCES += progressmanager/progressmanager_win.cpp
LIBS += -lole32 LIBS += -lole32 -luser32
} }
else:macx { else:macx {
OBJECTIVE_SOURCES += progressmanager/progressmanager_mac.mm OBJECTIVE_SOURCES += progressmanager/progressmanager_mac.mm

5
src/plugins/coreplugin/coreplugin.qbs
View File

@@ -24,8 +24,9 @@ QtcPlugin {
] ]
cpp.dynamicLibraries: { cpp.dynamicLibraries: {
if (qbs.targetOS == 'windows') return [ if (qbs.targetOS == "windows") return [
"ole32" "ole32",
"user32"
] ]
} }