From aad21102e94d0327fe16e089252aeb21b4dbb9ae Mon Sep 17 00:00:00 2001
From: Stephan Binner <stephan.binner@basyskom.com>
Date: Tue, 30 May 2017 21:09:02 +0200
Subject: Convert features.columnview to QT_[REQUIRE_]CONFIG

Side effect: fix of QT_NO_COLUMNVIEW <-> QT_NO_QCOLUMNVIEW inconsistency.

Change-Id: I42702ea7b362a4b6fb5dad78ee105e6cbbf8bcf6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 src/widgets/itemviews/qcolumnview_p.h | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/widgets/itemviews/qcolumnview_p.h')

diff --git a/src/widgets/itemviews/qcolumnview_p.h b/src/widgets/itemviews/qcolumnview_p.h
index 7eff0f66cd..fa276075fe 100644
--- a/src/widgets/itemviews/qcolumnview_p.h
+++ b/src/widgets/itemviews/qcolumnview_p.h
@@ -54,8 +54,6 @@
 #include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include "qcolumnview.h"
 
-#ifndef QT_NO_QCOLUMNVIEW
-
 #include <private/qabstractitemview_p.h>
 
 #include <QtCore/qabstractitemmodel.h>
@@ -67,6 +65,8 @@
 #include <qevent.h>
 #include <qscrollbar.h>
 
+QT_REQUIRE_CONFIG(columnview);
+
 QT_BEGIN_NAMESPACE
 
 class QColumnViewPreviewColumn : public QAbstractItemView {
@@ -190,9 +190,7 @@ public:
                const QStyleOptionViewItem &option,
                const QModelIndex &index) const Q_DECL_OVERRIDE;
 };
-#endif // QT_NO_QCOLUMNVIEW
-
 
 QT_END_NAMESPACE
-#endif //QCOLUMNVIEW_P_H
 
+#endif //QCOLUMNVIEW_P_H
-- 
cgit v1.2.3