From 01703d026420cd0964bec872f7af54fd077b82ad Mon Sep 17 00:00:00 2001
From: Stephan Binner <stephan.binner@basyskom.com>
Date: Sun, 9 Jul 2017 16:53:58 +0200
Subject: Convert features.tableview to QT_[REQUIRE_]CONFIG

Change-Id: I7ab479deff7bbf3083d1efa196e0480b181548c5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 src/widgets/accessible/complexwidgets.cpp |  1 -
 src/widgets/accessible/itemviews.cpp      | 16 +++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'src/widgets/accessible')

diff --git a/src/widgets/accessible/complexwidgets.cpp b/src/widgets/accessible/complexwidgets.cpp
index 4770c513cf..dd9bea1aec 100644
--- a/src/widgets/accessible/complexwidgets.cpp
+++ b/src/widgets/accessible/complexwidgets.cpp
@@ -46,7 +46,6 @@
 #include <qtabbar.h>
 #include <qcombobox.h>
 #include <qlistview.h>
-#include <qtableview.h>
 #include <qlineedit.h>
 #include <qstyle.h>
 #include <qstyleoption.h>
diff --git a/src/widgets/accessible/itemviews.cpp b/src/widgets/accessible/itemviews.cpp
index 3cef564781..87c0a59563 100644
--- a/src/widgets/accessible/itemviews.cpp
+++ b/src/widgets/accessible/itemviews.cpp
@@ -40,7 +40,9 @@
 #include "itemviews_p.h"
 
 #include <qheaderview.h>
+#if QT_CONFIG(tableview)
 #include <qtableview.h>
+#endif
 #include <qlistview.h>
 #include <qtreeview.h>
 #include <private/qtreeview_p.h>
@@ -81,7 +83,7 @@ QAccessibleTable::QAccessibleTable(QWidget *w)
 {
     Q_ASSERT(view());
 
-#ifndef QT_NO_TABLEVIEW
+#if QT_CONFIG(tableview)
     if (qobject_cast<const QTableView*>(view())) {
         m_role = QAccessible::Table;
     } else
@@ -117,7 +119,7 @@ QHeaderView *QAccessibleTable::horizontalHeader() const
 {
     QHeaderView *header = 0;
     if (false) {
-#ifndef QT_NO_TABLEVIEW
+#if QT_CONFIG(tableview)
     } else if (const QTableView *tv = qobject_cast<const QTableView*>(view())) {
         header = tv->horizontalHeader();
 #endif
@@ -133,7 +135,7 @@ QHeaderView *QAccessibleTable::verticalHeader() const
 {
     QHeaderView *header = 0;
     if (false) {
-#ifndef QT_NO_TABLEVIEW
+#if QT_CONFIG(tableview)
     } else if (const QTableView *tv = qobject_cast<const QTableView*>(view())) {
         header = tv->verticalHeader();
 #endif
@@ -866,7 +868,7 @@ QHeaderView *QAccessibleTableCell::horizontalHeader() const
     QHeaderView *header = 0;
 
     if (false) {
-#ifndef QT_NO_TABLEVIEW
+#if QT_CONFIG(tableview)
     } else if (const QTableView *tv = qobject_cast<const QTableView*>(view)) {
         header = tv->horizontalHeader();
 #endif
@@ -882,7 +884,7 @@ QHeaderView *QAccessibleTableCell::horizontalHeader() const
 QHeaderView *QAccessibleTableCell::verticalHeader() const
 {
     QHeaderView *header = 0;
-#ifndef QT_NO_TABLEVIEW
+#if QT_CONFIG(tableview)
     if (const QTableView *tv = qobject_cast<const QTableView*>(view))
         header = tv->verticalHeader();
 #endif
@@ -1125,7 +1127,7 @@ QRect QAccessibleTableHeaderCell::rect() const
 {
     QHeaderView *header = 0;
     if (false) {
-#ifndef QT_NO_TABLEVIEW
+#if QT_CONFIG(tableview)
     } else if (const QTableView *tv = qobject_cast<const QTableView*>(view)) {
         if (orientation == Qt::Horizontal) {
             header = tv->horizontalHeader();
@@ -1192,7 +1194,7 @@ QHeaderView *QAccessibleTableHeaderCell::headerView() const
 {
     QHeaderView *header = 0;
     if (false) {
-#ifndef QT_NO_TABLEVIEW
+#if QT_CONFIG(tableview)
     } else if (const QTableView *tv = qobject_cast<const QTableView*>(view)) {
         if (orientation == Qt::Horizontal) {
             header = tv->horizontalHeader();
-- 
cgit v1.2.3