From 506df46f0b6e9f13a19da4bcbe4dee09106491d4 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 .
Change-Id: I636d1741a6fa7fb7eb35e51a513ad88950f606f6
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 | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/plugins/coreplugin/coreplugin.pro b/src/plugins/coreplugin/coreplugin.pro
index 0c5642f97f9..5cdf12a4939 100644
--- a/src/plugins/coreplugin/coreplugin.pro
+++ b/src/plugins/coreplugin/coreplugin.pro
@@ -216,7 +216,7 @@ RESOURCES += core.qrc \
win32 {
SOURCES += progressmanager/progressmanager_win.cpp
greaterThan(QT_MAJOR_VERSION, 4): QT += gui-private # Uses QPlatformNativeInterface.
- LIBS += -lole32
+ LIBS += -lole32 -luser32
}
else:macx {
HEADERS += macfullscreen.h
diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs
index e916974ba8c..255d946c4db 100644
--- a/src/plugins/coreplugin/coreplugin.qbs
+++ b/src/plugins/coreplugin/coreplugin.qbs
@@ -30,7 +30,8 @@ QtcPlugin {
cpp.dynamicLibraries: {
if (qbs.targetOS == "windows") return [
- "ole32"
+ "ole32",
+ "user32"
]
}
--
GitLab