From d7202a5bf9a128c2a12d3abb95c2edcb5f1a0b53 Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@nokia.com>
Date: Tue, 28 Aug 2012 12:17:10 +0200
Subject: [PATCH] Fix initial qtVersionsChanged signal

Change-Id: I9df9f158382f4ab7152130d7fb0ef9be311f12bd
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
---
 src/plugins/qtsupport/qtversionmanager.cpp | 8 +++++---
 src/plugins/qtsupport/qtversionmanager.h   | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/plugins/qtsupport/qtversionmanager.cpp b/src/plugins/qtsupport/qtversionmanager.cpp
index 14ec9a7659c..7d93a1d04be 100644
--- a/src/plugins/qtsupport/qtversionmanager.cpp
+++ b/src/plugins/qtsupport/qtversionmanager.cpp
@@ -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();
 }
 
diff --git a/src/plugins/qtsupport/qtversionmanager.h b/src/plugins/qtsupport/qtversionmanager.h
index f2f4697c446..a13b5cd8d3f 100644
--- a/src/plugins/qtsupport/qtversionmanager.h
+++ b/src/plugins/qtsupport/qtversionmanager.h
@@ -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...