feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.6' into 4.0

Browse Source
This commit is contained in:
Oswald Buddenhagen
2016-03-30 10:56:25 +02:00
parent af0b93196b fb137ade7d
commit f9a182a285
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/coreplugin/variablechooser.cpp
View File

@@ -240,7 +240,10 @@ VariableChooserPrivate::VariableChooserPrivate(VariableChooser *parent)
: q(parent),
m_lineEdit(0),
m_textEdit(0),
m_plainTextEdit(0)
m_plainTextEdit(0),
m_iconButton(0),
m_variableTree(0),
m_variableDescription(0)
{
m_defaultDescription = VariableChooser::tr("Select a variable to insert.");
@@ -403,7 +406,8 @@ void VariableChooser::addSupportForChildWidgets(QWidget *parent, MacroExpander *
*/
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());
}
/*!