diff options
Diffstat (limited to 'src/plugins/platforms/windows')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsaccessibility.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsaccessibility.h | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/windows/windows.pro | 2 |
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) { |