From 9d3417d2a857cec21ba9e7f6382600a8383cb5da Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Tue, 13 Sep 2011 15:55:41 +0200 Subject: 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 Reviewed-by: Qt Sanity Bot --- src/plugins/accessible/widgets/complexwidgets.cpp | 2 +- src/plugins/accessible/widgets/main.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/plugins') 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(widget)) { iface = new QAccessibleTree(widget); @@ -278,7 +278,7 @@ QAccessibleInterface *AccessibleFactory::create(const QString &classname, QObjec && widget->objectName() == QLatin1String("qt_scrollarea_viewport") && qobject_cast(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")) { -- cgit v1.2.3