summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/windows
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-09-30 15:59:33 +0200
committerQt by Nokia <qt-info@nokia.com>2011-10-03 07:57:41 +0200
commit73945fb9f223a732a7e739a1c9786bbe110fdf3e (patch)
tree0a5fd3c5924655f4b3f00cb32ba2140d92c29b6f /src/plugins/platforms/windows
parentf18b690cca2de6c75e70a2fd5871edf9fa993a5e (diff)
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>
Diffstat (limited to 'src/plugins/platforms/windows')
-rw-r--r--src/plugins/platforms/windows/qwindowsaccessibility.cpp3
-rw-r--r--src/plugins/platforms/windows/qwindowsaccessibility.h2
-rw-r--r--src/plugins/platforms/windows/windows.pro2
3 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/platforms/windows/qwindowsaccessibility.cpp b/src/plugins/platforms/windows/qwindowsaccessibility.cpp
index fdc32730ad..39452da71b 100644
--- 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 d27b28cf48..aec3ffd4b1 100644
--- 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 f188ef53b1..ad97c88bc2 100644
--- 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) {