summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJerome Leclanche <adys.wh@gmail.com>2012-03-15 00:41:15 +0000
committerQt by Nokia <qt-info@nokia.com>2012-03-15 14:51:47 +0100
commit006a49b19ac100df587f23eb76dc4ba8855047a0 (patch)
treef0f6408254154a8f56b818b273a5bc46f305ea96 /src
parent99b8b647e3623325a8bfe39bea66c71c5467cdbc (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')
-rw-r--r--src/gui/kernel/qplatformintegration_qpa.cpp4
-rw-r--r--src/gui/kernel/qplatformintegration_qpa.h2
-rw-r--r--src/plugins/platforms/xcb/qxcbintegration.cpp6
-rw-r--r--src/plugins/platforms/xcb/qxcbintegration.h4
-rw-r--r--src/widgets/kernel/qwidgetwindow_qpa.cpp4
-rw-r--r--src/widgets/kernel/qwidgetwindow_qpa_p.h2
-rw-r--r--src/widgets/widgets/qtabbar.cpp4
-rw-r--r--src/widgets/widgets/qtabbar.h3
8 files changed, 27 insertions, 2 deletions
diff --git a/src/gui/kernel/qplatformintegration_qpa.cpp b/src/gui/kernel/qplatformintegration_qpa.cpp
index c9ccc27ad0..786e915a19 100644
--- a/src/gui/kernel/qplatformintegration_qpa.cpp
+++ b/src/gui/kernel/qplatformintegration_qpa.cpp
@@ -260,6 +260,8 @@ QPlatformInputContext *QPlatformIntegration::inputContext() const
return 0;
}
+#ifndef QT_NO_ACCESSIBILITY
+
/*!
Returns the platforms accessibility.
@@ -270,6 +272,8 @@ QPlatformAccessibility *QPlatformIntegration::accessibility() const
return 0;
}
+#endif
+
QVariant QPlatformIntegration::styleHint(StyleHint hint) const
{
switch (hint) {
diff --git a/src/gui/kernel/qplatformintegration_qpa.h b/src/gui/kernel/qplatformintegration_qpa.h
index d6f5b6658a..632b3af613 100644
--- a/src/gui/kernel/qplatformintegration_qpa.h
+++ b/src/gui/kernel/qplatformintegration_qpa.h
@@ -105,7 +105,9 @@ public:
virtual QPlatformDrag *drag() const;
#endif
virtual QPlatformInputContext *inputContext() const;
+#ifndef QT_NO_ACCESSIBILITY
virtual QPlatformAccessibility *accessibility() const;
+#endif
// Access native handles. The window handle is already available from Wid;
virtual QPlatformNativeInterface *nativeInterface() const;
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 &parameters)
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;
diff --git a/src/widgets/kernel/qwidgetwindow_qpa.cpp b/src/widgets/kernel/qwidgetwindow_qpa.cpp
index 4d5e9d5774..f58dddb70f 100644
--- a/src/widgets/kernel/qwidgetwindow_qpa.cpp
+++ b/src/widgets/kernel/qwidgetwindow_qpa.cpp
@@ -43,7 +43,9 @@
#include "private/qwidget_p.h"
#include "private/qapplication_p.h"
+#ifndef QT_NO_ACCESSIBILITY
#include <QtGui/qaccessible.h>
+#endif
QT_BEGIN_NAMESPACE
@@ -60,12 +62,14 @@ QWidgetWindow::QWidgetWindow(QWidget *widget)
{
}
+#ifndef QT_NO_ACCESSIBILITY
QAccessibleInterface *QWidgetWindow::accessibleRoot() const
{
if (m_widget)
return QAccessible::queryAccessibleInterface(m_widget);
return 0;
}
+#endif
QObject *QWidgetWindow::focusObject() const
{
diff --git a/src/widgets/kernel/qwidgetwindow_qpa_p.h b/src/widgets/kernel/qwidgetwindow_qpa_p.h
index 1e8813fddc..e5c07a2d3a 100644
--- a/src/widgets/kernel/qwidgetwindow_qpa_p.h
+++ b/src/widgets/kernel/qwidgetwindow_qpa_p.h
@@ -62,7 +62,9 @@ public:
QWidgetWindow(QWidget *widget);
QWidget *widget() const { return m_widget; }
+#ifndef QT_NO_ACCESSIBILITY
QAccessibleInterface *accessibleRoot() const;
+#endif
QObject *focusObject() const;
protected:
diff --git a/src/widgets/widgets/qtabbar.cpp b/src/widgets/widgets/qtabbar.cpp
index af360701fa..84c32e519b 100644
--- a/src/widgets/widgets/qtabbar.cpp
+++ b/src/widgets/widgets/qtabbar.cpp
@@ -359,8 +359,10 @@ void QTabBarPrivate::init()
#endif
q->setFocusPolicy(Qt::TabFocus);
+#ifndef QT_NO_ACCESSIBILITY
leftB->setAccessibleName(QTabBar::tr("Scroll Left"));
rightB->setAccessibleName(QTabBar::tr("Scroll Right"));
+#endif
q->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
elideMode = Qt::TextElideMode(q->style()->styleHint(QStyle::SH_TabBar_ElideMode, 0, q));
useScrollButtons = !q->style()->styleHint(QStyle::SH_TabBar_PreferNoArrows, 0, q);
@@ -1737,7 +1739,7 @@ void QTabBar::mouseMoveEvent(QMouseEvent *event)
if (d->pressedIndex != -1
&& event->buttons() == Qt::NoButton)
d->moveTabFinished(d->pressedIndex);
-
+
// Start drag
if (!d->dragInProgress && d->pressedIndex != -1) {
if ((event->pos() - d->dragStartPosition).manhattanLength() > QApplication::startDragDistance()) {
diff --git a/src/widgets/widgets/qtabbar.h b/src/widgets/widgets/qtabbar.h
index 3a4b9198d3..85586f5e57 100644
--- a/src/widgets/widgets/qtabbar.h
+++ b/src/widgets/widgets/qtabbar.h
@@ -197,8 +197,9 @@ protected:
void changeEvent(QEvent *);
void initStyleOption(QStyleOptionTab *option, int tabIndex) const;
-
+#ifndef QT_NO_ACCESSIBILITY
friend class QAccessibleTabBar;
+#endif
private:
Q_DISABLE_COPY(QTabBar)
Q_DECLARE_PRIVATE(QTabBar)