diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-02 12:38:43 +0200 |
---|---|---|
committer | Kai Koehne <kai.koehne@digia.com> | 2014-07-03 15:08:44 +0200 |
commit | 71c58f036957fdda4012703c6de7891c20455242 (patch) | |
tree | 7319e186b515e747717708fadf03d2ed3da859cb | |
parent | b398515b09d23b5b94d16676b709de6c0b382e56 (diff) |
Fix build with -no-accessibility
Change-Id: Ib66d806b978c9e187d614fe1c553db7dc2b4ffaa
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
-rw-r--r-- | src/platformsupport/accessibility/accessibility.pri | 12 | ||||
-rw-r--r-- | src/widgets/widgets/qwidgettextcontrol.cpp | 6 |
2 files changed, 12 insertions, 6 deletions
diff --git a/src/platformsupport/accessibility/accessibility.pri b/src/platformsupport/accessibility/accessibility.pri index d63cd9656b..fb56edbf1a 100644 --- a/src/platformsupport/accessibility/accessibility.pri +++ b/src/platformsupport/accessibility/accessibility.pri @@ -1,7 +1,9 @@ -INCLUDEPATH += $$PWD +contains(QT_CONFIG, accessibility) { + INCLUDEPATH += $$PWD -HEADERS += \ - $$PWD/qaccessiblebridgeutils_p.h + HEADERS += \ + $$PWD/qaccessiblebridgeutils_p.h -SOURCES += \ - $$PWD/qaccessiblebridgeutils.cpp + SOURCES += \ + $$PWD/qaccessiblebridgeutils.cpp +} diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp index a6b1aceb66..5f60bf02d0 100644 --- a/src/widgets/widgets/qwidgettextcontrol.cpp +++ b/src/widgets/widgets/qwidgettextcontrol.cpp @@ -645,8 +645,8 @@ void QWidgetTextControlPrivate::_q_emitCursorPosChanged(const QTextCursor &someC void QWidgetTextControlPrivate::_q_contentsChanged(int from, int charsRemoved, int charsAdded) { - Q_Q(QWidgetTextControl); #ifndef QT_NO_ACCESSIBILITY + Q_Q(QWidgetTextControl); if (QAccessible::isActive() && q->parent() && q->parent()->isWidgetType()) { QTextCursor tmp(doc); @@ -670,6 +670,10 @@ void QWidgetTextControlPrivate::_q_contentsChanged(int from, int charsRemoved, i QAccessible::updateAccessibility(ev); delete ev; } +#else + Q_UNUSED(from) + Q_UNUSED(charsRemoved) + Q_UNUSED(charsAdded) #endif } |