AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Windows plugin: Fix compilation with MinGW.

Browse Source 
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>
This commit is contained in:
Friedemann Kleint 2011-09-30 15:59:33 +02:00 committed by Qt by Nokia
parent f18b690cca
commit 73945fb9f2
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/platforms/windows/qwindowsaccessibility.cpp
View File

@ -58,7 +58,8 @@
#include <QtGui/qaccessible.h> #include <QtGui/qaccessible.h>
#include <QtGui/qplatformnativeinterface_qpa.h> #include <QtGui/qplatformnativeinterface_qpa.h>
#include <QtGui/qwindow.h> #include <QtGui/qwindow.h>
#include "qt_windows.h"
#include <OleAcc.h>
//#include <uiautomationcoreapi.h> //#include <uiautomationcoreapi.h>
#ifndef UiaRootObjectId #ifndef UiaRootObjectId

2
src/plugins/platforms/windows/qwindowsaccessibility.h
View File

@ -42,8 +42,8 @@
#ifndef QWINDOWSACCESSIBILITY_H #ifndef QWINDOWSACCESSIBILITY_H
#define QWINDOWSACCESSIBILITY_H #define QWINDOWSACCESSIBILITY_H
#include "qtwindowsglobal.h"
#include <QtGui/QPlatformAccessibility> #include <QtGui/QPlatformAccessibility>
#include <OleAcc.h>
class QWindowsAccessibility : public QPlatformAccessibility class QWindowsAccessibility : public QPlatformAccessibility
{ {

2
src/plugins/platforms/windows/windows.pro
View File

@ -8,7 +8,7 @@ INCLUDEPATH += ../../../3rdparty/harfbuzz/src
QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms
# Note: OpenGL32 must precede Gdi32 as it overwrites some functions. # 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 win32-g++: LIBS *= -luuid
contains(QT_CONFIG, directwrite) { contains(QT_CONFIG, directwrite) {