Windows plugin: Fix compilation with MinGW.

Change-Id: I6c522b121fbac31ac5fc60a9125e1565e78d50c0
Reviewed-on: http://codereview.qt-project.org/5890
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

diff --git a/src/plugins/platforms/windows/qwindowsaccessibility.cpp b/src/plugins/platforms/windows/qwindowsaccessibility.cpp
index fdc3273..39452da 100644 (file)
--- a/src/plugins/platforms/windows/qwindowsaccessibility.cpp
+++ b/src/plugins/platforms/windows/qwindowsaccessibility.cpp
@@ -58,7 +58,8 @@
 #include <QtGui/qaccessible.h>
 #include <QtGui/qplatformnativeinterface_qpa.h>
 #include <QtGui/qwindow.h>
-#include "qt_windows.h"
+
+#include <OleAcc.h>
 
 //#include <uiautomationcoreapi.h>
 #ifndef UiaRootObjectId

diff --git a/src/plugins/platforms/windows/qwindowsaccessibility.h b/src/plugins/platforms/windows/qwindowsaccessibility.h
index d27b28c..aec3ffd 100644 (file)
--- a/src/plugins/platforms/windows/qwindowsaccessibility.h
+++ b/src/plugins/platforms/windows/qwindowsaccessibility.h
@@ -42,8 +42,8 @@
 #ifndef QWINDOWSACCESSIBILITY_H
 #define QWINDOWSACCESSIBILITY_H
 
+#include "qtwindowsglobal.h"
 #include <QtGui/QPlatformAccessibility>
-#include <OleAcc.h>
 
 class QWindowsAccessibility : public QPlatformAccessibility
 {

diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro
index f188ef5..ad97c88 100644 (file)
--- a/src/plugins/platforms/windows/windows.pro
+++ b/src/plugins/platforms/windows/windows.pro
@@ -8,7 +8,7 @@ INCLUDEPATH += ../../../3rdparty/harfbuzz/src
 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms
 
 # Note: OpenGL32 must precede Gdi32 as it overwrites some functions.
-LIBS *= -lOpenGL32 -lGdi32 -lUser32 -lOle32 -lWinspool -lImm32 -lWinmm
+LIBS *= -lOpenGL32 -lGdi32 -lUser32 -lOle32 -lWinspool -lImm32 -lWinmm  -lOleaut32
 win32-g++: LIBS *= -luuid
 
 contains(QT_CONFIG, directwrite) {