From 26ab24a6694b8094d84db5d5a68cb1e42d8dc369 Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Fri, 17 Jul 2009 17:23:48 +0200
Subject: [PATCH] Fix crash if we are adding a qtversion while still loading
the project.
Only connect in restoreSettingsImpl() not in the constructor.
---
src/plugins/qt4projectmanager/qt4project.cpp | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index 79b68a71a53..11bd2b8a76f 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -239,13 +239,6 @@ Qt4Project::Qt4Project(Qt4Manager *manager, const QString& fileName) :
{
m_manager->registerProject(this);
- QtVersionManager *vm = QtVersionManager::instance();
-
- connect(vm, SIGNAL(defaultQtVersionChanged()),
- this, SLOT(defaultQtVersionChanged()));
- connect(vm, SIGNAL(qtVersionsChanged()),
- this, SLOT(qtVersionsChanged()));
-
m_updateCodeModelTimer.setSingleShot(true);
m_updateCodeModelTimer.setInterval(20);
connect(&m_updateCodeModelTimer, SIGNAL(timeout()), this, SLOT(updateCodeModel()));
@@ -334,6 +327,13 @@ bool Qt4Project::restoreSettingsImpl(PersistentSettingsReader &settingsReader)
}
// Now connect
+ QtVersionManager *vm = QtVersionManager::instance();
+ connect(vm, SIGNAL(defaultQtVersionChanged()),
+ this, SLOT(defaultQtVersionChanged()));
+ connect(vm, SIGNAL(qtVersionsChanged()),
+ this, SLOT(qtVersionsChanged()));
+
+
connect(m_nodesWatcher, SIGNAL(foldersAboutToBeAdded(FolderNode *, const QList<FolderNode*> &)),
this, SLOT(foldersAboutToBeAdded(FolderNode *, const QList<FolderNode*> &)));
connect(m_nodesWatcher, SIGNAL(foldersAdded()), this, SLOT(checkForNewApplicationProjects()));
--
GitLab