From b542c8634651e6662140b334b12f5889dc7616ec Mon Sep 17 00:00:00 2001 From: Tobias Koenig Date: Sun, 28 Oct 2012 08:25:32 +0100 Subject: [PATCH] Add support for TextBrowser --- declarativeobjects.cpp | 8 ++++++++ declarativeobjects_p.h | 9 +++++++++ declarativewidgetdocument.cpp | 1 + gallery.qml | 4 ++++ qwidgets.list | 1 - 5 files changed, 22 insertions(+), 1 deletions(-) diff --git a/declarativeobjects.cpp b/declarativeobjects.cpp index 2b56b7f..29cb0c9 100644 --- a/declarativeobjects.cpp +++ b/declarativeobjects.cpp @@ -1334,6 +1334,14 @@ DeclarativeTabWidgetAttached *DeclarativeTabWidget::qmlAttachedProperties(QObjec CUSTOM_METAOBJECT(DeclarativeTabWidget, QTabWidget) +// DeclarativeTextBrowser +DeclarativeTextBrowser::DeclarativeTextBrowser(QObject *parent) : DeclarativeWidgetProxy(parent) +{ + connectAllSignals(m_proxiedObject, this); +} + +CUSTOM_METAOBJECT(DeclarativeTextBrowser, QTextBrowser) + // DeclarativeTextEdit DeclarativeTextEdit::DeclarativeTextEdit(QObject *parent) : DeclarativeWidgetProxy(parent) { diff --git a/declarativeobjects_p.h b/declarativeobjects_p.h index 7c45e11..313ec1a 100644 --- a/declarativeobjects_p.h +++ b/declarativeobjects_p.h @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -779,6 +780,14 @@ class DeclarativeTabWidget : public DeclarativeWidgetProxy QML_DECLARE_TYPEINFO(DeclarativeTabWidget, QML_HAS_ATTACHED_PROPERTIES) +class DeclarativeTextBrowser : public DeclarativeWidgetProxy +{ + DECLARATIVE_OBJECT + + public: + DeclarativeTextBrowser(QObject *parent = 0); +}; + class DeclarativeTextEdit : public DeclarativeWidgetProxy { DECLARATIVE_OBJECT diff --git a/declarativewidgetdocument.cpp b/declarativewidgetdocument.cpp index 61d5887..bda2c43 100644 --- a/declarativewidgetdocument.cpp +++ b/declarativewidgetdocument.cpp @@ -72,6 +72,7 @@ DeclarativeWidgetDocument::DeclarativeWidgetDocument(const QUrl &url, QObject *p qmlRegisterType("QtGui", 1, 0, "StatusBar"); qmlRegisterType(); qmlRegisterType("QtGui", 1, 0, "TabWidget"); + qmlRegisterType("QtGui", 1, 0, "TextBrowser"); qmlRegisterType("QtGui", 1, 0, "TextEdit"); qmlRegisterType("QtGui", 1, 0, "ToolBar"); qmlRegisterType("QtGui", 1, 0, "Widget"); diff --git a/gallery.qml b/gallery.qml index 954e4f3..5f13d17 100644 --- a/gallery.qml +++ b/gallery.qml @@ -21,5 +21,9 @@ Widget { PlainTextEdit { plainText: qsTr("Hello World") } + TextBrowser { + openExternalLinks: true + html: "Coolest project ever" + } } } diff --git a/qwidgets.list b/qwidgets.list index 26af61d..3dba9bb 100644 --- a/qwidgets.list +++ b/qwidgets.list @@ -39,7 +39,6 @@ qtabbar.h qtableview.h qtablewidget.h qtabwidget.h -qtextbrowser.h qtoolbox.h qtoolbutton.h qtreeview.h -- 1.7.2.5