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

Fix initial qtVersionsChanged signal

Browse Source 
Change-Id: I9df9f158382f4ab7152130d7fb0ef9be311f12bd
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
This commit is contained in:
Daniel Teske
2012-08-28 12:17:10 +02:00
parent 69059fef8a
commit d7202a5bf9
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qtsupport/qtversionmanager.cpp
View File

@@ -136,7 +136,7 @@ QtVersionManager::QtVersionManager() :
void QtVersionManager::extensionsInitialized() void QtVersionManager::extensionsInitialized()
{ {
bool success = restoreQtVersions(); bool success = restoreQtVersions();
updateFromInstaller(); updateFromInstaller(false);
if (!success) { if (!success) {
// We did neither restore our settings or upgraded // We did neither restore our settings or upgraded
// in that case figure out if there's a qt in path // in that case figure out if there's a qt in path
@@ -144,6 +144,7 @@ void QtVersionManager::extensionsInitialized()
findSystemQt(); findSystemQt();
} }
emit qtVersionsChanged(m_versions.keys(), QList<int>(), QList<int>());
saveQtVersions(); saveQtVersions();
const Utils::FileName configFileName = globalSettingsFileName(); const Utils::FileName configFileName = globalSettingsFileName();
@@ -231,7 +232,7 @@ bool QtVersionManager::restoreQtVersions()
return true; return true;
} }
void QtVersionManager::updateFromInstaller() void QtVersionManager::updateFromInstaller(bool emitSignal)
{ {
m_fileWatcherTimer->stop(); m_fileWatcherTimer->stop();
@@ -353,7 +354,8 @@ void QtVersionManager::updateFromInstaller()
qDebug() << ""; qDebug() << "";
} }
} }
emit qtVersionsChanged(added, removed, changed); if (emitSignal)
emit qtVersionsChanged(added, removed, changed);
saveQtVersions(); saveQtVersions();
} }

2
src/plugins/qtsupport/qtversionmanager.h
View File

@@ -109,7 +109,7 @@ public slots:
void updateDumpFor(const Utils::FileName &qmakeCommand); void updateDumpFor(const Utils::FileName &qmakeCommand);
private slots: private slots:
void updateFromInstaller(); void updateFromInstaller(bool emitSignal = true);
private: private:
// This function is really simplistic... // This function is really simplistic...