diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2012-04-19 12:50:05 +0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-19 13:26:51 +0200 |
| commit | 73423db31d505e4101b446554c840e933c93f7df (patch) | |
| tree | d72a9bc7c88dd28555dfde8ad7767abfc09ca074 /src/plugins | |
| parent | c4e308d3f7ad8f2bc6c8e88a89acd1f95a5b46c6 (diff) | |
qwindowsintegration: fix build with -no-accessibility config option set
Change-Id: I2f4080b04f61ec425d41180f0163cebcc745c1b9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/plugins')
4 files changed, 16 insertions, 1 deletions
diff --git a/src/plugins/platforms/windows/qwindowscontext.cpp b/src/plugins/platforms/windows/qwindowscontext.cpp index c5b1dcce9f..6913bc8dd4 100644 --- a/src/plugins/platforms/windows/qwindowscontext.cpp +++ b/src/plugins/platforms/windows/qwindowscontext.cpp @@ -47,7 +47,9 @@ #include "qtwindowsglobal.h" #include "qwindowsmime.h" #include "qwindowsinputcontext.h" +#ifndef QT_NO_ACCESSIBILITY #include "accessible/qwindowsaccessibility.h" +#endif #include "qwindowsscreen.h" #include "qwindowstheme.h" @@ -698,7 +700,11 @@ bool QWindowsContext::windowsProc(HWND hwnd, UINT message, case QtWindows::UnknownEvent: return false; case QtWindows::AccessibleObjectFromWindowRequest: +#ifndef QT_NO_ACCESSIBILITY return QWindowsAccessibility::handleAccessibleObjectFromWindowRequest(hwnd, wParam, lParam, result); +#else + return false; +#endif case QtWindows::DisplayChangedEvent: return d->m_screenManager.handleDisplayChange(wParam, lParam); default: diff --git a/src/plugins/platforms/windows/qwindowsintegration.cpp b/src/plugins/platforms/windows/qwindowsintegration.cpp index d8d04fc1b6..f014a956f8 100644 --- a/src/plugins/platforms/windows/qwindowsintegration.cpp +++ b/src/plugins/platforms/windows/qwindowsintegration.cpp @@ -56,7 +56,9 @@ #include "qwindowsdrag.h" #include "qwindowsinputcontext.h" #include "qwindowskeymapper.h" +#ifndef QT_NO_ACCESSIBILITY #include "accessible/qwindowsaccessibility.h" +#endif #include <QtGui/QPlatformNativeInterface> #include <QtGui/QWindowSystemInterface> @@ -182,7 +184,9 @@ struct QWindowsIntegrationPrivate QWindowsGuiEventDispatcher *m_eventDispatcher; QOpenGLStaticContextPtr m_staticOpenGLContext; QWindowsInputContext m_inputContext; +#ifndef QT_NO_ACCESSIBILITY QWindowsAccessibility m_accessibility; +#endif QWindowsServices m_services; }; @@ -374,10 +378,12 @@ QPlatformInputContext * QWindowsIntegration::inputContext() const return &d->m_inputContext; } +#ifndef QT_NO_ACCESSIBILITY QPlatformAccessibility *QWindowsIntegration::accessibility() const { return &d->m_accessibility; } +#endif QWindowsIntegration *QWindowsIntegration::instance() { diff --git a/src/plugins/platforms/windows/qwindowsintegration.h b/src/plugins/platforms/windows/qwindowsintegration.h index 20fd790bfe..84bbf6103a 100644 --- a/src/plugins/platforms/windows/qwindowsintegration.h +++ b/src/plugins/platforms/windows/qwindowsintegration.h @@ -66,7 +66,9 @@ public: virtual QPlatformClipboard *clipboard() const; virtual QPlatformDrag *drag() const; virtual QPlatformInputContext *inputContext() const; +#ifndef QT_NO_ACCESSIBILITY virtual QPlatformAccessibility *accessibility() const; +#endif virtual QPlatformNativeInterface *nativeInterface() const; virtual QPlatformFontDatabase *fontDatabase() const; virtual QStringList themeNames() const; diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro index 87bc7245c4..63275d3402 100644 --- a/src/plugins/platforms/windows/windows.pro +++ b/src/plugins/platforms/windows/windows.pro @@ -149,6 +149,7 @@ contains(QT_CONFIG, freetype) { OTHER_FILES += windows.json -include(accessible/accessible.pri) +contains(QT_CONFIG, accessibility):include(accessible/accessible.pri) + target.path += $$[QT_INSTALL_PLUGINS]/platforms INSTALLS += target |