[patch] Updated patch also prevent remaining segfaults

qt-creator-3.6.1-variablechooser.patch (text/plain), 1.00 KB, created by Herb Miller Jr. on 2016-11-27 15:49:16 UTC

--- qt-creator-opensource-src-3.6.1/src/plugins/coreplugin/variablechooser.cpp  2016-03-08 06:30:19.000000000 -0500
+++ qt-creator-opensource-src-3.6.1/src/plugins/coreplugin/variablechooser.cppb 2016-11-22 22:00:19.583860319 -0500
@@ -250,9 +250,9 @@
     m_defaultDescription = VariableChooser::tr("Select a variable to insert.");
 
     m_variableTree = new VariableTreeView(q, this);
-    m_variableTree->setModel(&m_model);
-
     m_variableDescription = new QLabel(q);
+
+    m_variableTree->setModel(&m_model);
     m_variableDescription->setText(m_defaultDescription);
     m_variableDescription->setMinimumSize(QSize(0, 60));
     m_variableDescription->setAlignment(Qt::AlignLeft|Qt::AlignTop);
@@ -408,7 +408,8 @@
  */
 void VariableChooserPrivate::updateDescription(const QModelIndex &index)
 {
-    m_variableDescription->setText(m_model.data(index, Qt::ToolTipRole).toString());
+    if (m_variableDescription)
+        m_variableDescription->setText(m_model.data(index, Qt::ToolTipRole).toString());
 }
 
 /*!