forked from qt-creator/qt-creator
Fix initial qtVersionsChanged signal
Change-Id: I9df9f158382f4ab7152130d7fb0ef9be311f12bd Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
This commit is contained in:
@@ -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,6 +354,7 @@ void QtVersionManager::updateFromInstaller()
|
||||
qDebug() << "";
|
||||
}
|
||||
}
|
||||
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...
|
||||
|
Reference in New Issue
Block a user