Add features.widgettextcontrol

Change-Id: I6d525f70e1d54b4c8383dfa387cfd5c364fab354
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>

6 files changed, 31 insertions, 11 deletions

diff --git a/src/widgets/configure.json b/src/widgets/configure.json
index 14e4d10d38..dedea8c59e 100644
--- a/src/widgets/configure.json
+++ b/src/widgets/configure.json
@@ -163,10 +163,17 @@
             "condition": "features.rubberband",
             "output": [ "publicFeature", "feature" ]
         },
+        "widgettextcontrol": {
+            "label": "QWidgetTextControl",
+            "purpose": "Provides text control functionality to other widgets.",
+            "section": "Widgets",
+            "output": [ "privateFeature" ]
+        },
         "label": {
             "label": "QLabel",
             "purpose": "Provides a text or image display.",
             "section": "Widgets",
+            "condition": "features.widgettextcontrol",
             "output": [ "publicFeature" ]
         },
         "formlayout": {
@@ -193,6 +200,7 @@
             "label": "QLineEdit",
             "purpose": "Provides single-line edits.",
             "section": "Widgets",
+            "condition": "features.widgettextcontrol",
             "output": [ "publicFeature", "feature" ]
         },
         "radiobutton": {
@@ -382,7 +390,7 @@
             "label": "QGraphicsView",
             "purpose": "Provides a canvas/sprite framework.",
             "section": "Widgets",
-            "condition": "features.scrollarea",
+            "condition": "features.scrollarea && features.widgettextcontrol",
             "output": [ "publicFeature", "feature" ]
         },
         "graphicseffect": {
@@ -396,7 +404,7 @@
             "label": "QTextEdit",
             "purpose": "Supports rich text editing.",
             "section": "Widgets",
-            "condition": "features.scrollarea && features.properties",
+            "condition": "features.scrollarea && features.properties && features.widgettextcontrol",
             "output": [ "publicFeature", "feature" ]
         },
         "syntaxhighlighter": {
diff --git a/src/widgets/widgets/qplaintextedit_p.h b/src/widgets/widgets/qplaintextedit_p.h
index f0dd1c0ed4..803623c974 100644
--- a/src/widgets/widgets/qplaintextedit_p.h
+++ b/src/widgets/widgets/qplaintextedit_p.h
@@ -60,11 +60,12 @@
 #include "QtWidgets/qmenu.h"
 #include "QtGui/qabstracttextdocumentlayout.h"
 #include "QtCore/qbasictimer.h"
-#include "private/qwidgettextcontrol_p.h"
 #include "qplaintextedit.h"
 
 #ifndef QT_NO_TEXTEDIT
 
+#include "private/qwidgettextcontrol_p.h"
+
 QT_BEGIN_NAMESPACE
 
 class QMimeData;
diff --git a/src/widgets/widgets/qtextedit_p.h b/src/widgets/widgets/qtextedit_p.h
index cca315ce30..13d0eb323a 100644
--- a/src/widgets/widgets/qtextedit_p.h
+++ b/src/widgets/widgets/qtextedit_p.h
@@ -61,13 +61,14 @@
 #include "QtGui/qabstracttextdocumentlayout.h"
 #include "QtCore/qbasictimer.h"
 #include "QtCore/qurl.h"
-#include "private/qwidgettextcontrol_p.h"
 #include "qtextedit.h"
 
-QT_BEGIN_NAMESPACE
-
 #ifndef QT_NO_TEXTEDIT
 
+#include "private/qwidgettextcontrol_p.h"
+
+QT_BEGIN_NAMESPACE
+
 class QMimeData;
 class QTextEditPrivate : public QAbstractScrollAreaPrivate
 {
@@ -135,9 +136,9 @@ public:
     QBasicTimer deleteAllTimer;
 #endif
 };
-#endif // QT_NO_TEXTEDIT
-
 
 QT_END_NAMESPACE
 
+#endif // QT_NO_TEXTEDIT
+
 #endif // QTEXTEDIT_P_H
diff --git a/src/widgets/widgets/qwidgettextcontrol_p.h b/src/widgets/widgets/qwidgettextcontrol_p.h
index f540a3c9ad..e2539a30e7 100644
--- a/src/widgets/widgets/qwidgettextcontrol_p.h
+++ b/src/widgets/widgets/qwidgettextcontrol_p.h
@@ -65,6 +65,8 @@
 #include <QtCore/qmimedata.h>
 #include <QtGui/private/qinputcontrol_p.h>
 
+QT_REQUIRE_CONFIG(widgettextcontrol);
+
 QT_BEGIN_NAMESPACE
 
 
diff --git a/src/widgets/widgets/qwidgettextcontrol_p_p.h b/src/widgets/widgets/qwidgettextcontrol_p_p.h
index 35027ff82a..357ffdc6bd 100644
--- a/src/widgets/widgets/qwidgettextcontrol_p_p.h
+++ b/src/widgets/widgets/qwidgettextcontrol_p_p.h
@@ -62,6 +62,8 @@
 #include "QtCore/qpointer.h"
 #include "private/qobject_p.h"
 
+QT_REQUIRE_CONFIG(widgettextcontrol);
+
 QT_BEGIN_NAMESPACE
 
 class QMimeData;
diff --git a/src/widgets/widgets/widgets.pri b/src/widgets/widgets/widgets.pri
index 22e083a3d4..086585f0e6 100644
--- a/src/widgets/widgets/widgets.pri
+++ b/src/widgets/widgets/widgets.pri
@@ -65,8 +65,6 @@ HEADERS += \
         widgets/qfocusframe.h \
         widgets/qscrollarea.h \
         widgets/qwidgetanimator_p.h \
-        widgets/qwidgettextcontrol_p.h \
-        widgets/qwidgettextcontrol_p_p.h \
         widgets/qwidgetlinecontrol_p.h \
         widgets/qtoolbararealayout_p.h \
         widgets/qplaintextedit.h \
@@ -120,7 +118,6 @@ SOURCES += \
         widgets/qfocusframe.cpp \
         widgets/qscrollarea.cpp \
         widgets/qwidgetanimator.cpp \
-        widgets/qwidgettextcontrol.cpp \
         widgets/qwidgetlinecontrol.cpp \
         widgets/qtoolbararealayout.cpp \
         widgets/qplaintextedit.cpp
@@ -194,6 +191,15 @@ qtConfig(dialogbuttonbox) {
         widgets/qdialogbuttonbox.cpp
 }
 
+qtConfig(widgettextcontrol) {
+    HEADERS += \
+        widgets/qwidgettextcontrol_p.h \
+        widgets/qwidgettextcontrol_p_p.h
+
+    SOURCES += \
+        widgets/qwidgettextcontrol.cpp
+}
+
 macx {
     HEADERS += \
         widgets/qmacnativewidget_mac.h \