From 6441d5f214ebed34c0b91ee60d326fa87125de38 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Mon, 30 Jul 2012 12:27:11 +0200
Subject: [PATCH] Fix linking of the core plugin on Windows.

DestroyIcon needs user32.dll.

Introduced by e0f16c3093b50bee85790d3cc2c58b87b3d92cc4 .

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

Change-Id: I11075c9cb911af403cb5ded74437c5a785fb768c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
---
 src/plugins/coreplugin/coreplugin.pro | 2 +-
 src/plugins/coreplugin/coreplugin.qbs | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/plugins/coreplugin/coreplugin.pro b/src/plugins/coreplugin/coreplugin.pro
index d7eb7b20b0d..14f4581362c 100644
--- a/src/plugins/coreplugin/coreplugin.pro
+++ b/src/plugins/coreplugin/coreplugin.pro
@@ -210,7 +210,7 @@ RESOURCES += core.qrc \
 
 win32 {
     SOURCES += progressmanager/progressmanager_win.cpp
-    LIBS += -lole32
+    LIBS += -lole32 -luser32
 }
 else:macx {
     OBJECTIVE_SOURCES += progressmanager/progressmanager_mac.mm
diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs
index 46f396fbcdf..789bc77c3ac 100644
--- a/src/plugins/coreplugin/coreplugin.qbs
+++ b/src/plugins/coreplugin/coreplugin.qbs
@@ -24,8 +24,9 @@ QtcPlugin {
     ]
 
     cpp.dynamicLibraries: {
-        if (qbs.targetOS == 'windows') return [
-            "ole32"
+        if (qbs.targetOS == "windows") return [
+            "ole32",
+            "user32"
         ]
     }