From 5ad16332d97544596aae973490bf0bc010c841bf Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Thu, 5 Apr 2018 19:06:14 +0200 Subject: [PATCH] Ensure compatibility with QTextEdit --- src/gui/editorwidgets/qgstexteditwrapper.cpp | 10 +++++++--- src/gui/editorwidgets/qgstexteditwrapper.h | 3 ++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/gui/editorwidgets/qgstexteditwrapper.cpp b/src/gui/editorwidgets/qgstexteditwrapper.cpp index eb5da83c3d1..989f6ac3192 100644 --- a/src/gui/editorwidgets/qgstexteditwrapper.cpp +++ b/src/gui/editorwidgets/qgstexteditwrapper.cpp @@ -100,7 +100,8 @@ QWidget *QgsTextEditWrapper::createWidget( QWidget *parent ) void QgsTextEditWrapper::initWidget( QWidget *editor ) { - mTextEdit = qobject_cast( editor ); + mTextBrowser = qobject_cast( editor ); + mTextEdit = qobject_cast( editor ); mPlainTextEdit = qobject_cast( editor ); mLineEdit = qobject_cast( editor ); @@ -225,8 +226,11 @@ void QgsTextEditWrapper::setWidgetValue( const QVariant &val ) if ( config( QStringLiteral( "UseHtml" ) ).toBool() ) { mTextEdit->setHtml( v ); - mTextEdit->setTextInteractionFlags( Qt::LinksAccessibleByMouse ); - mTextEdit->setOpenExternalLinks( true ); + if ( mTextBrowser ) + { + mTextBrowser->setTextInteractionFlags( Qt::LinksAccessibleByMouse ); + mTextBrowser->setOpenExternalLinks( true ); + } } else mTextEdit->setPlainText( v ); diff --git a/src/gui/editorwidgets/qgstexteditwrapper.h b/src/gui/editorwidgets/qgstexteditwrapper.h index d2380da404b..c85509fb409 100644 --- a/src/gui/editorwidgets/qgstexteditwrapper.h +++ b/src/gui/editorwidgets/qgstexteditwrapper.h @@ -68,7 +68,8 @@ class GUI_EXPORT QgsTextEditWrapper : public QgsEditorWidgetWrapper void textChanged( const QString &text ); private: - QTextBrowser *mTextEdit = nullptr; + QTextBrowser *mTextBrowser = nullptr; + QTextEdit *mTextEdit = nullptr; QPlainTextEdit *mPlainTextEdit = nullptr; QLineEdit *mLineEdit = nullptr; QPalette mReadOnlyPalette;