From 620d87fbcd8222f10c87acc4b0bafda2a7695793 Mon Sep 17 00:00:00 2001 From: Tobias Koenig Date: Sun, 28 Oct 2012 08:18:54 +0100 Subject: [PATCH] Add support for PlainTextEdit --- declarativeobjects.cpp | 8 ++++++++ declarativeobjects_p.h | 9 +++++++++ declarativewidgetdocument.cpp | 1 + gallery.qml | 3 +++ qwidgets.list | 1 - 5 files changed, 21 insertions(+), 1 deletions(-) diff --git a/declarativeobjects.cpp b/declarativeobjects.cpp index 5ae5873..2b56b7f 100644 --- a/declarativeobjects.cpp +++ b/declarativeobjects.cpp @@ -1161,6 +1161,14 @@ DeclarativeMessageBoxAttached *DeclarativeMessageBox::qmlAttachedProperties(QObj CUSTOM_METAOBJECT(DeclarativeMessageBox, QMessageBox) +// DeclarativePlainTextEdit +DeclarativePlainTextEdit::DeclarativePlainTextEdit(QObject *parent) : DeclarativeWidgetProxy(parent) +{ + connectAllSignals(m_proxiedObject, this); +} + +CUSTOM_METAOBJECT(DeclarativePlainTextEdit, QPlainTextEdit) + // DeclarativePushButton DeclarativePushButton::DeclarativePushButton(QObject *parent) : DeclarativeWidgetProxy(parent) { diff --git a/declarativeobjects_p.h b/declarativeobjects_p.h index 030386b..7c45e11 100644 --- a/declarativeobjects_p.h +++ b/declarativeobjects_p.h @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -673,6 +674,14 @@ class DeclarativeMessageBox : public DeclarativeObjectProxy QML_DECLARE_TYPEINFO(DeclarativeMessageBox, QML_HAS_ATTACHED_PROPERTIES) +class DeclarativePlainTextEdit : public DeclarativeWidgetProxy +{ + DECLARATIVE_OBJECT + + public: + DeclarativePlainTextEdit(QObject *parent = 0); +}; + class DeclarativePushButton : public DeclarativeWidgetProxy { DECLARATIVE_OBJECT diff --git a/declarativewidgetdocument.cpp b/declarativewidgetdocument.cpp index 315cafc..61d5887 100644 --- a/declarativewidgetdocument.cpp +++ b/declarativewidgetdocument.cpp @@ -65,6 +65,7 @@ DeclarativeWidgetDocument::DeclarativeWidgetDocument(const QUrl &url, QObject *p qmlRegisterType("QtGui", 1, 0, "MenuBar"); qmlRegisterType(); qmlRegisterType("QtGui", 1, 0, "MessageBox"); + qmlRegisterType("QtGui", 1, 0, "PlainTextEdit"); qmlRegisterType("QtGui", 1, 0, "PushButton"); qmlRegisterType("QtGui", 1, 0, "Slider"); qmlRegisterType(); diff --git a/gallery.qml b/gallery.qml index ecf19b7..954e4f3 100644 --- a/gallery.qml +++ b/gallery.qml @@ -18,5 +18,8 @@ Widget { minimumWidth: 100 minimumHeight: 100 } + PlainTextEdit { + plainText: qsTr("Hello World") + } } } diff --git a/qwidgets.list b/qwidgets.list index 8a7c613..26af61d 100644 --- a/qwidgets.list +++ b/qwidgets.list @@ -25,7 +25,6 @@ qlistwidget.h qmdiarea.h qmdisubwindow.h qmessagebox.h -qplaintextedit.h qprintpreviewwidget.h qprogressbar.h qradiobutton.h -- 1.7.2.5