From 006a49b19ac100df587f23eb76dc4ba8855047a0 Mon Sep 17 00:00:00 2001 From: Jerome Leclanche Date: Thu, 15 Mar 2012 00:41:15 +0000 Subject: 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 --- src/widgets/widgets/qtabbar.cpp | 4 +++- src/widgets/widgets/qtabbar.h | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src/widgets/widgets') 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) -- cgit v1.2.3