Commit d7202a5b authored by Daniel Teske's avatar Daniel Teske
Browse files

Fix initial qtVersionsChanged signal



Change-Id: I9df9f158382f4ab7152130d7fb0ef9be311f12bd
Reviewed-by: default avatarChristian Kandeler <christian.kandeler@nokia.com>
parent 69059fef
......@@ -136,7 +136,7 @@ QtVersionManager::QtVersionManager() :
void QtVersionManager::extensionsInitialized()
{
bool success = restoreQtVersions();
updateFromInstaller();
updateFromInstaller(false);
if (!success) {
// We did neither restore our settings or upgraded
// in that case figure out if there's a qt in path
......@@ -144,6 +144,7 @@ void QtVersionManager::extensionsInitialized()
findSystemQt();
}
emit qtVersionsChanged(m_versions.keys(), QList<int>(), QList<int>());
saveQtVersions();
const Utils::FileName configFileName = globalSettingsFileName();
......@@ -231,7 +232,7 @@ bool QtVersionManager::restoreQtVersions()
return true;
}
void QtVersionManager::updateFromInstaller()
void QtVersionManager::updateFromInstaller(bool emitSignal)
{
m_fileWatcherTimer->stop();
......@@ -353,7 +354,8 @@ void QtVersionManager::updateFromInstaller()
qDebug() << "";
}
}
emit qtVersionsChanged(added, removed, changed);
if (emitSignal)
emit qtVersionsChanged(added, removed, changed);
saveQtVersions();
}
......
......@@ -109,7 +109,7 @@ public slots:
void updateDumpFor(const Utils::FileName &qmakeCommand);
private slots:
void updateFromInstaller();
void updateFromInstaller(bool emitSignal = true);
private:
// This function is really simplistic...
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment