diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-19 09:47:29 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-19 09:47:29 +0200 |
commit | 407302fb1b823fbe0ae09c031862f87b252489e6 (patch) | |
tree | f192faf40b9009ee6a884ed4b7d0b3942b6810ac /src/widgets/accessible/qaccessiblewidgetfactory.cpp | |
parent | 0f30dcaea8129092142fe87d2d14209c75363f66 (diff) | |
parent | ad3b41a06d9ba7219c79b5548c5b11698787288d (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/corelib/io/qwindowspipewriter.cpp
src/widgets/styles/qcommonstyle.cpp
Change-Id: I0d33efdc4dc256e234abc490a18ccda72cd1d9e6
Diffstat (limited to 'src/widgets/accessible/qaccessiblewidgetfactory.cpp')
-rw-r--r-- | src/widgets/accessible/qaccessiblewidgetfactory.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/widgets/accessible/qaccessiblewidgetfactory.cpp b/src/widgets/accessible/qaccessiblewidgetfactory.cpp index ccd176cd04..a39674dc7a 100644 --- a/src/widgets/accessible/qaccessiblewidgetfactory.cpp +++ b/src/widgets/accessible/qaccessiblewidgetfactory.cpp @@ -46,7 +46,9 @@ #include "itemviews_p.h" #include <qtoolbutton.h> +#if QT_CONFIG(treeview) #include <qtreeview.h> +#endif #include <qvariant.h> #include <qaccessible.h> @@ -140,10 +142,10 @@ QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *obje } else if (classname == QLatin1String("QMenu")) { iface = new QAccessibleMenu(widget); #endif -#ifndef QT_NO_TREEVIEW +#if QT_CONFIG(treeview) } else if (classname == QLatin1String("QTreeView")) { iface = new QAccessibleTree(widget); -#endif // QT_NO_TREEVIEW +#endif // QT_CONFIG(treeview) #ifndef QT_NO_ITEMVIEWS } else if (classname == QLatin1String("QTableView") || classname == QLatin1String("QListView")) { iface = new QAccessibleTable(widget); |