OSDN Git Service

Qt4Project: Always notify the code models if the file list changed.
authorChristian Kamm <christian.d.kamm@nokia.com>
Thu, 15 Sep 2011 10:15:10 +0000 (12:15 +0200)
committerDaniel Teske <daniel.teske@nokia.com>
Thu, 15 Sep 2011 10:20:50 +0000 (12:20 +0200)
Change-Id: Id795a363c9f990e9506eb35ed5a398948f93cf2f
Reviewed-on: http://codereview.qt-project.org/4967
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
src/plugins/qt4projectmanager/qt4project.cpp

index f1d00e1..7c5cdaa 100644 (file)
@@ -353,6 +353,7 @@ void Qt4Project::updateFileList()
     if (newFiles != *m_projectFiles) {
         *m_projectFiles = newFiles;
         emit fileListChanged();
+        updateCodeModels();
         if (debug)
             qDebug() << Q_FUNC_INFO << *m_projectFiles;
     }
@@ -392,8 +393,6 @@ bool Qt4Project::fromMap(const QVariantMap &map)
 
     update();
     updateFileList();
-    // This might be incorrect, need a full update
-    updateCodeModels();
 
     foreach (Target *t, targets())
         static_cast<Qt4BaseTarget *>(t)->createApplicationProFiles();
@@ -799,7 +798,6 @@ void Qt4Project::decrementPendingEvaluateFutures()
             foreach (Target *t, targets())
                 static_cast<Qt4BaseTarget *>(t)->createApplicationProFiles();
             updateFileList();
-            updateCodeModels();
             if (debug)
                 qDebug()<<"  Setting state to Base";
             m_asyncUpdateState = Base;