diff options
| author | Frederik Gladhorn <frederik.gladhorn@nokia.com> | 2011-09-13 15:55:41 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-15 20:39:28 +0200 |
| commit | 9d3417d2a857cec21ba9e7f6382600a8383cb5da (patch) | |
| tree | 9e6a37be17ae70718c5235f54d3af86af2582ba3 /src/plugins/accessible/widgets | |
| parent | 1416f4c595d6078c08f93483695e0b64c7fbb2a7 (diff) | |
The Q_WS_X11 define exists no longer. Use Q_OS_UNIX.
Change-Id: I1c4b5d4187e1593aa52bc9162d9692959b55e077
Reviewed-on: http://codereview.qt-project.org/4786
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Diffstat (limited to 'src/plugins/accessible/widgets')
| -rw-r--r-- | src/plugins/accessible/widgets/complexwidgets.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/accessible/widgets/main.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/accessible/widgets/complexwidgets.cpp b/src/plugins/accessible/widgets/complexwidgets.cpp index 331cd88f38..9e340d714f 100644 --- a/src/plugins/accessible/widgets/complexwidgets.cpp +++ b/src/plugins/accessible/widgets/complexwidgets.cpp @@ -1776,7 +1776,7 @@ QString QAccessibleComboBox::text(Text t, int child) const switch (t) { case Name: -#ifndef Q_WS_X11 // on Linux we use relations for this, name is text (fall through to Value) +#ifndef Q_OS_UNIX // on Linux we use relations for this, name is text (fall through to Value) if (child == OpenList) str = QComboBox::tr("Open"); else diff --git a/src/plugins/accessible/widgets/main.cpp b/src/plugins/accessible/widgets/main.cpp index f2da7b1dfd..a7b3a95090 100644 --- a/src/plugins/accessible/widgets/main.cpp +++ b/src/plugins/accessible/widgets/main.cpp @@ -254,7 +254,7 @@ QAccessibleInterface *AccessibleFactory::create(const QString &classname, QObjec iface = new QAccessibleMenu(widget); #endif #ifndef QT_NO_ITEMVIEWS -#ifdef Q_WS_X11 +#ifdef Q_OS_UNIX } else if (classname == QLatin1String("QAbstractItemView")) { if (qobject_cast<const QTreeView*>(widget)) { iface = new QAccessibleTree(widget); @@ -278,7 +278,7 @@ QAccessibleInterface *AccessibleFactory::create(const QString &classname, QObjec && widget->objectName() == QLatin1String("qt_scrollarea_viewport") && qobject_cast<QAbstractItemView*>(widget->parentWidget())) { iface = new QAccessibleItemView(widget); -#endif // Q_WS_X11 +#endif // Q_OS_UNIX #endif // QT_NO_ITEMVIEWS #ifndef QT_NO_TABBAR } else if (classname == QLatin1String("QTabBar")) { |