1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qwindowsintegration: fix build with -no-accessibility config option set

Browse Source 
Change-Id: I2f4080b04f61ec425d41180f0163cebcc745c1b9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Konstantin Ritt 2012-04-19 12:50:05 +03:00 committed by Qt by Nokia
parent c4e308d3f7
commit 73423db31d
4 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/platforms/windows/qwindowscontext.cpp
View File

@ -47,7 +47,9 @@
#include "qtwindowsglobal.h" #include "qtwindowsglobal.h"
#include "qwindowsmime.h" #include "qwindowsmime.h"
#include "qwindowsinputcontext.h" #include "qwindowsinputcontext.h"
#ifndef QT_NO_ACCESSIBILITY
#include "accessible/qwindowsaccessibility.h" #include "accessible/qwindowsaccessibility.h"
#endif
#include "qwindowsscreen.h" #include "qwindowsscreen.h"
#include "qwindowstheme.h" #include "qwindowstheme.h"
@ -698,7 +700,11 @@ bool QWindowsContext::windowsProc(HWND hwnd, UINT message,
case QtWindows::UnknownEvent: case QtWindows::UnknownEvent:
return false; return false;
case QtWindows::AccessibleObjectFromWindowRequest: case QtWindows::AccessibleObjectFromWindowRequest:
#ifndef QT_NO_ACCESSIBILITY
return QWindowsAccessibility::handleAccessibleObjectFromWindowRequest(hwnd, wParam, lParam, result); return QWindowsAccessibility::handleAccessibleObjectFromWindowRequest(hwnd, wParam, lParam, result);
#else
return false;
#endif
case QtWindows::DisplayChangedEvent: case QtWindows::DisplayChangedEvent:
return d->m_screenManager.handleDisplayChange(wParam, lParam); return d->m_screenManager.handleDisplayChange(wParam, lParam);
default: default:

6
src/plugins/platforms/windows/qwindowsintegration.cpp
View File

@ -56,7 +56,9 @@
#include "qwindowsdrag.h" #include "qwindowsdrag.h"
#include "qwindowsinputcontext.h" #include "qwindowsinputcontext.h"
#include "qwindowskeymapper.h" #include "qwindowskeymapper.h"
#ifndef QT_NO_ACCESSIBILITY
#include "accessible/qwindowsaccessibility.h" #include "accessible/qwindowsaccessibility.h"
#endif
#include <QtGui/QPlatformNativeInterface> #include <QtGui/QPlatformNativeInterface>
#include <QtGui/QWindowSystemInterface> #include <QtGui/QWindowSystemInterface>
@ -182,7 +184,9 @@ struct QWindowsIntegrationPrivate
QWindowsGuiEventDispatcher *m_eventDispatcher; QWindowsGuiEventDispatcher *m_eventDispatcher;
QOpenGLStaticContextPtr m_staticOpenGLContext; QOpenGLStaticContextPtr m_staticOpenGLContext;
QWindowsInputContext m_inputContext; QWindowsInputContext m_inputContext;
#ifndef QT_NO_ACCESSIBILITY
QWindowsAccessibility m_accessibility; QWindowsAccessibility m_accessibility;
#endif
QWindowsServices m_services; QWindowsServices m_services;
}; };
@ -374,10 +378,12 @@ QPlatformInputContext * QWindowsIntegration::inputContext() const
return &d->m_inputContext; return &d->m_inputContext;
} }
#ifndef QT_NO_ACCESSIBILITY
QPlatformAccessibility *QWindowsIntegration::accessibility() const QPlatformAccessibility *QWindowsIntegration::accessibility() const
{ {
return &d->m_accessibility; return &d->m_accessibility;
} }
#endif
QWindowsIntegration *QWindowsIntegration::instance() QWindowsIntegration *QWindowsIntegration::instance()
{ {

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

@ -66,7 +66,9 @@ public:
virtual QPlatformClipboard *clipboard() const; virtual QPlatformClipboard *clipboard() const;
virtual QPlatformDrag *drag() const; virtual QPlatformDrag *drag() const;
virtual QPlatformInputContext *inputContext() const; virtual QPlatformInputContext *inputContext() const;
#ifndef QT_NO_ACCESSIBILITY
virtual QPlatformAccessibility *accessibility() const; virtual QPlatformAccessibility *accessibility() const;
#endif
virtual QPlatformNativeInterface *nativeInterface() const; virtual QPlatformNativeInterface *nativeInterface() const;
virtual QPlatformFontDatabase *fontDatabase() const; virtual QPlatformFontDatabase *fontDatabase() const;
virtual QStringList themeNames() const; virtual QStringList themeNames() const;

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

@ -149,6 +149,7 @@ contains(QT_CONFIG, freetype) {
OTHER_FILES += windows.json OTHER_FILES += windows.json
include(accessible/accessible.pri) contains(QT_CONFIG, accessibility):include(accessible/accessible.pri)
target.path += $$[QT_INSTALL_PLUGINS]/platforms target.path += $$[QT_INSTALL_PLUGINS]/platforms
INSTALLS += target INSTALLS += target