AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add features.widgettextcontrol

Browse Source 
Change-Id: I6d525f70e1d54b4c8383dfa387cfd5c364fab354
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
This commit is contained in:
Stephan Binner 2017-03-13 21:02:19 +01:00
parent 202d6ad730
commit e54356151c
6 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/widgets/configure.json
View File

@ -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": {

3
src/widgets/widgets/qplaintextedit_p.h
View File

@ -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;

11
src/widgets/widgets/qtextedit_p.h
View File

@ -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

2
src/widgets/widgets/qwidgettextcontrol_p.h
View File

@ -65,6 +65,8 @@
#include <QtCore/qmimedata.h>
#include <QtGui/private/qinputcontrol_p.h>
QT_REQUIRE_CONFIG(widgettextcontrol);
QT_BEGIN_NAMESPACE

2
src/widgets/widgets/qwidgettextcontrol_p_p.h
View File

@ -62,6 +62,8 @@
#include "QtCore/qpointer.h"
#include "private/qobject_p.h"
QT_REQUIRE_CONFIG(widgettextcontrol);
QT_BEGIN_NAMESPACE
class QMimeData;

12
src/widgets/widgets/widgets.pri
View File

@ -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 \