From 9833e682174c968efb62e6cd473787e3b0b8fb05 Mon Sep 17 00:00:00 2001
From: Stephan Binner <stephan.binner@basyskom.com>
Date: Sun, 3 Sep 2017 18:44:21 +0200
Subject: Convert features.textedit to QT_[REQUIRE_]CONFIG

Change-Id: I0fb0e658796484f374586d8d1f0f1b9167ab30d2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 src/widgets/widgets/qwidgettextcontrol_p.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/widgets/widgets/qwidgettextcontrol_p.h')

diff --git a/src/widgets/widgets/qwidgettextcontrol_p.h b/src/widgets/widgets/qwidgettextcontrol_p.h
index e2539a30e7..c17ab2cf17 100644
--- a/src/widgets/widgets/qwidgettextcontrol_p.h
+++ b/src/widgets/widgets/qwidgettextcontrol_p.h
@@ -56,7 +56,9 @@
 #include <QtGui/qtextoption.h>
 #include <QtGui/qtextcursor.h>
 #include <QtGui/qtextformat.h>
+#if QT_CONFIG(textedit)
 #include <QtWidgets/qtextedit.h>
+#endif
 #include <QtWidgets/qmenu.h>
 #include <QtCore/qrect.h>
 #include <QtGui/qabstracttextdocumentlayout.h>
@@ -148,7 +150,7 @@ public:
     bool acceptRichText() const;
     void setAcceptRichText(bool accept);
 
-#ifndef QT_NO_TEXTEDIT
+#if QT_CONFIG(textedit)
     void setExtraSelections(const QList<QTextEdit::ExtraSelection> &selections);
     QList<QTextEdit::ExtraSelection> extraSelections() const;
 #endif
-- 
cgit v1.2.3


From 6d699d08200b1fe3a616dfbc275d46c98b77fcbd Mon Sep 17 00:00:00 2001
From: Stephan Binner <stephan.binner@basyskom.com>
Date: Sun, 3 Sep 2017 18:45:41 +0200
Subject: Convert features.menu to QT_[REQUIRE_]CONFIG

Change-Id: I031356411294b259ebd2b22c53159c93fd92af6e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 src/widgets/widgets/qwidgettextcontrol_p.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/widgets/widgets/qwidgettextcontrol_p.h')

diff --git a/src/widgets/widgets/qwidgettextcontrol_p.h b/src/widgets/widgets/qwidgettextcontrol_p.h
index c17ab2cf17..11ff63c5e4 100644
--- a/src/widgets/widgets/qwidgettextcontrol_p.h
+++ b/src/widgets/widgets/qwidgettextcontrol_p.h
@@ -59,7 +59,9 @@
 #if QT_CONFIG(textedit)
 #include <QtWidgets/qtextedit.h>
 #endif
+#if QT_CONFIG(menu)
 #include <QtWidgets/qmenu.h>
+#endif
 #include <QtCore/qrect.h>
 #include <QtGui/qabstracttextdocumentlayout.h>
 #include <QtGui/qtextdocumentfragment.h>
-- 
cgit v1.2.3