From 0c5e2328284e97a293e1153c6ad1bcd2706e044a Mon Sep 17 00:00:00 2001 From: Volker Krause Date: Wed, 5 Dec 2012 11:42:58 +0100 Subject: Compile with QT_NO_CURSOR. Mostly straightforward, the a11y changes might look a bit drastic, but the base class QAccessibleTextWidget was already disabled in this case, so we have to obviously take out its sub-classes as well. Change-Id: I682ace20d6938688ddb1da23c3463f3c025fab8e Reviewed-by: Marc Mutz Reviewed-by: Tasuku Suzuki Reviewed-by: Frederik Gladhorn Reviewed-by: Lars Knoll Reviewed-by: Nicolas Arnaud-Cormos --- src/plugins/accessible/widgets/qaccessiblewidgets.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/plugins/accessible/widgets/qaccessiblewidgets.cpp') diff --git a/src/plugins/accessible/widgets/qaccessiblewidgets.cpp b/src/plugins/accessible/widgets/qaccessiblewidgets.cpp index 56e6166e85..e93a82c0ce 100644 --- a/src/plugins/accessible/widgets/qaccessiblewidgets.cpp +++ b/src/plugins/accessible/widgets/qaccessiblewidgets.cpp @@ -99,7 +99,7 @@ QList childWidgets(const QWidget *widget, bool includeTopLevel) return widgets; } -#ifndef QT_NO_TEXTEDIT +#if !defined(QT_NO_TEXTEDIT) && !defined(QT_NO_CURSOR) QAccessiblePlainTextEdit::QAccessiblePlainTextEdit(QWidget* o) :QAccessibleTextWidget(o) @@ -292,7 +292,7 @@ void QAccessibleTextEdit::scrollToSubstring(int startIndex, int endIndex) qWarning("AccessibleTextEdit::scrollToSubstring failed!"); } -#endif // QT_NO_TEXTEDIT +#endif // QT_NO_TEXTEDIT && QT_NO_CURSOR #ifndef QT_NO_STACKEDWIDGET // ======================= QAccessibleStackedWidget ====================== @@ -488,7 +488,7 @@ QAccessibleDialogButtonBox::QAccessibleDialogButtonBox(QWidget *widget) #endif // QT_NO_DIALOGBUTTONBOX -#ifndef QT_NO_TEXTBROWSER +#if !defined(QT_NO_TEXTBROWSER) && !defined(QT_NO_CURSOR) QAccessibleTextBrowser::QAccessibleTextBrowser(QWidget *widget) : QAccessibleTextEdit(widget) { @@ -499,7 +499,7 @@ QAccessible::Role QAccessibleTextBrowser::role() const { return QAccessible::StaticText; } -#endif // QT_NO_TEXTBROWSER +#endif // QT_NO_TEXTBROWSER && QT_NO_CURSOR #ifndef QT_NO_CALENDARWIDGET // ===================== QAccessibleCalendarWidget ======================== -- cgit v1.2.3