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

Fix crash on importing

Browse Source 
I can't fully explain the backtrace, but connecting to
qtVersionsChanged() in ::init() and not the ctor is the correct thing to
do.

Task-Nr: QTCREATORBUG-1653
Reviewed-By: hunger
This commit is contained in:
dt
2010-06-22 14:38:50 +02:00
parent 5bb23ade98
commit d3ba80bfad
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
View File

@@ -105,10 +105,6 @@ Qt4ProjectConfigWidget::Qt4ProjectConfigWidget(Qt4Project *project)
connect(project, SIGNAL(buildDirectoryInitialized()), connect(project, SIGNAL(buildDirectoryInitialized()),
this, SLOT(updateImportLabel())); this, SLOT(updateImportLabel()));
QtVersionManager *vm = QtVersionManager::instance();
connect(vm, SIGNAL(qtVersionsChanged(QList<int>)),
this, SLOT(qtVersionsChanged()));
} }
Qt4ProjectConfigWidget::~Qt4ProjectConfigWidget() Qt4ProjectConfigWidget::~Qt4ProjectConfigWidget()
@@ -196,6 +192,9 @@ void Qt4ProjectConfigWidget::init(ProjectExplorer::BuildConfiguration *bc)
m_ui->nameLineEdit->setText(m_buildConfiguration->displayName()); m_ui->nameLineEdit->setText(m_buildConfiguration->displayName());
qtVersionsChanged(); qtVersionsChanged();
QtVersionManager *vm = QtVersionManager::instance();
connect(vm, SIGNAL(qtVersionsChanged(QList<int>)),
this, SLOT(qtVersionsChanged()));
bool shadowBuild = m_buildConfiguration->shadowBuild(); bool shadowBuild = m_buildConfiguration->shadowBuild();
m_ui->shadowBuildCheckBox->setChecked(shadowBuild); m_ui->shadowBuildCheckBox->setChecked(shadowBuild);
@@ -233,9 +232,6 @@ void Qt4ProjectConfigWidget::configNameEdited(const QString &newName)
void Qt4ProjectConfigWidget::qtVersionsChanged() void Qt4ProjectConfigWidget::qtVersionsChanged()
{ {
if (!m_buildConfiguration) // not yet initialized
return;
m_ignoreChange = true; m_ignoreChange = true;
QtVersionManager *vm = QtVersionManager::instance(); QtVersionManager *vm = QtVersionManager::instance();