Ensure compatibility with QTextEdit

qgis · Apr 5, 2018 · 5ad16332d97544596aae973490bf0bc010c841bf · 5ad1633
1 parent 3c7b74f
commit 5ad16332d97544596aae973490bf0bc010c841bf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git 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<QTextBrowser *>( editor );
+  mTextBrowser = qobject_cast<QTextBrowser *>( editor );
+  mTextEdit = qobject_cast<QTextEdit *>( editor );
   mPlainTextEdit = qobject_cast<QPlainTextEdit *>( editor );
   mLineEdit = qobject_cast<QLineEdit *>( 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
@@ -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;