diff options
| author | Jerome Leclanche <adys.wh@gmail.com> | 2012-03-15 00:41:15 +0000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-15 14:51:47 +0100 |
| commit | 006a49b19ac100df587f23eb76dc4ba8855047a0 (patch) | |
| tree | f0f6408254154a8f56b818b273a5bc46f305ea96 /src/plugins/platforms/xcb | |
| parent | 99b8b647e3623325a8bfe39bea66c71c5467cdbc (diff) | |
Fix compiling with --no-accessibility
Adds missing QT_NO_ACCESSIBILITY checks where required to build
without accessibility support.
Change-Id: Id98ecdcb9b351289b21dc2d382100d0b63857db9
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Diffstat (limited to 'src/plugins/platforms/xcb')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbintegration.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbintegration.h | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/plugins/platforms/xcb/qxcbintegration.cpp b/src/plugins/platforms/xcb/qxcbintegration.cpp index 0db9ef9e64..50d3c4f1b5 100644 --- a/src/plugins/platforms/xcb/qxcbintegration.cpp +++ b/src/plugins/platforms/xcb/qxcbintegration.cpp @@ -82,7 +82,9 @@ #include <QtGui/QOpenGLContext> #include <QtGui/QScreen> +#ifndef QT_NO_ACCESSIBILITY #include <QtGui/QPlatformAccessibility> +#endif QT_BEGIN_NAMESPACE @@ -113,7 +115,9 @@ QXcbIntegration::QXcbIntegration(const QStringList ¶meters) m_fontDatabase.reset(new QGenericUnixFontDatabase()); m_inputContext.reset(QPlatformInputContextFactory::create()); +#ifndef QT_NO_ACCESSIBILITY m_accessibility.reset(new QPlatformAccessibility()); +#endif #if defined(QT_USE_XCB_SHARED_GRAPHICS_CACHE) m_sharedGraphicsCache.reset(new QXcbSharedGraphicsCache); @@ -246,10 +250,12 @@ QPlatformInputContext *QXcbIntegration::inputContext() const return m_inputContext.data(); } +#ifndef QT_NO_ACCESSIBILITY QPlatformAccessibility *QXcbIntegration::accessibility() const { return m_accessibility.data(); } +#endif #if defined(QT_USE_XCB_SHARED_GRAPHICS_CACHE) static bool sharedGraphicsCacheDisabled() diff --git a/src/plugins/platforms/xcb/qxcbintegration.h b/src/plugins/platforms/xcb/qxcbintegration.h index 4c335f2f06..58eebfe716 100644 --- a/src/plugins/platforms/xcb/qxcbintegration.h +++ b/src/plugins/platforms/xcb/qxcbintegration.h @@ -77,7 +77,9 @@ public: QPlatformInputContext *inputContext() const; +#ifndef QT_NO_ACCESSIBILITY QPlatformAccessibility *accessibility() const; +#endif #if defined(QT_USE_XCB_SHARED_GRAPHICS_CACHE) QPlatformSharedGraphicsCache *createPlatformSharedGraphicsCache(const char *cacheId) const; @@ -97,7 +99,9 @@ private: QScopedPointer<QPlatformInputContext> m_inputContext; QAbstractEventDispatcher *m_eventDispatcher; +#ifndef QT_NO_ACCESSIBILITY QScopedPointer<QPlatformAccessibility> m_accessibility; +#endif #if defined(QT_USE_XCB_SHARED_GRAPHICS_CACHE) QScopedPointer<QPlatformSharedGraphicsCache> m_sharedGraphicsCache; |