From 769769a2ec9ac5ab48df1108f34410df8bfad814 Mon Sep 17 00:00:00 2001
From: Stephan Binner <stephan.binner@basyskom.com>
Date: Tue, 13 Jun 2017 21:09:48 +0200
Subject: Convert features.undoview to QT_[REQUIRE_]CONFIG

Change-Id: Ic2945b9317f074301acd88602e3dae45e28b7c87
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 src/widgets/util/qundoview.cpp |  4 ----
 src/widgets/util/qundoview.h   |  3 +--
 src/widgets/util/util.pri      | 11 +++++++----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/widgets/util/qundoview.cpp b/src/widgets/util/qundoview.cpp
index 93c1778ea2..94610520b5 100644
--- a/src/widgets/util/qundoview.cpp
+++ b/src/widgets/util/qundoview.cpp
@@ -40,8 +40,6 @@
 #include "qundostack.h"
 #include "qundoview.h"
 
-#ifndef QT_NO_UNDOVIEW
-
 #include "qundogroup.h"
 #include <QtCore/qabstractitemmodel.h>
 #include <QtCore/qpointer.h>
@@ -473,5 +471,3 @@ QT_END_NAMESPACE
 
 #include "qundoview.moc"
 #include "moc_qundoview.cpp"
-
-#endif // QT_NO_UNDOVIEW
diff --git a/src/widgets/util/qundoview.h b/src/widgets/util/qundoview.h
index 3ed9ea5989..35cffb0a28 100644
--- a/src/widgets/util/qundoview.h
+++ b/src/widgets/util/qundoview.h
@@ -44,7 +44,7 @@
 #include <QtWidgets/qlistview.h>
 #include <QtCore/qstring.h>
 
-#ifndef QT_NO_UNDOVIEW
+QT_REQUIRE_CONFIG(undoview);
 
 QT_BEGIN_NAMESPACE
 
@@ -92,5 +92,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_UNDOVIEW
 #endif // QUNDOVIEW_H
diff --git a/src/widgets/util/util.pri b/src/widgets/util/util.pri
index b9b62d9bb0..60d4cd0872 100644
--- a/src/widgets/util/util.pri
+++ b/src/widgets/util/util.pri
@@ -8,16 +8,14 @@ HEADERS += \
         util/qsystemtrayicon_p.h \
         util/qundogroup.h \
         util/qundostack.h \
-        util/qundostack_p.h \
-        util/qundoview.h
+        util/qundostack_p.h
 
 SOURCES += \
         util/qsystemtrayicon.cpp \
         util/qcolormap.cpp \
         util/qcompleter.cpp \
         util/qundogroup.cpp \
-        util/qundostack.cpp \
-        util/qundoview.cpp
+        util/qundostack.cpp
 
 qtConfig(scroller) {
     HEADERS += \
@@ -33,6 +31,11 @@ qtConfig(scroller) {
         util/qflickgesture.cpp \
 }
 
+qtConfig(undoview) {
+    HEADERS += util/qundoview.h
+    SOURCES += util/qundoview.cpp
+}
+
 win32:!winrt {
     SOURCES += util/qsystemtrayicon_win.cpp
 } else: qtConfig(xcb) {
-- 
cgit v1.2.3