From 57fa668bcd980ee90ce1e378720165076ff6486b Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@nokia.com>
Date: Mon, 12 Sep 2011 13:25:12 +0200
Subject: [PATCH] Add Qt4Project::proParsingDone(), which is emitted after
parsing
Change-Id: Id2eb1d2494438bac17f3104ee8a9ed56cc9b1db9
Task-Nr: QTCREATORBUG-6056
Reviewed-on: http://codereview.qt-project.org/4665
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
---
src/plugins/qt4projectmanager/qt4project.cpp | 4 +++-
src/plugins/qt4projectmanager/qt4project.h | 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index 0c01d49f1a6..91fc60c3c38 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -648,6 +648,7 @@ void Qt4Project::update()
qDebug()<<"State is now Base";
m_asyncUpdateState = Base;
activeTarget()->activeQt4BuildConfiguration()->setEnabled(true);
+ emit proParsingDone();
}
void Qt4Project::scheduleAsyncUpdate(Qt4ProFileNode *node)
@@ -793,14 +794,15 @@ void Qt4Project::decrementPendingEvaluateFutures()
m_asyncUpdateTimer.start();
} else if (m_asyncUpdateState != ShuttingDown){
// After being done, we need to call:
+ m_asyncUpdateState = Base;
activeTarget()->activeQt4BuildConfiguration()->setEnabled(true);
foreach (Target *t, targets())
static_cast<Qt4BaseTarget *>(t)->createApplicationProFiles();
updateFileList();
updateCodeModels();
+ emit proParsingDone();
if (debug)
qDebug()<<" Setting state to Base";
- m_asyncUpdateState = Base;
}
}
}
diff --git a/src/plugins/qt4projectmanager/qt4project.h b/src/plugins/qt4projectmanager/qt4project.h
index 51007abaac0..f9533b36bfa 100644
--- a/src/plugins/qt4projectmanager/qt4project.h
+++ b/src/plugins/qt4projectmanager/qt4project.h
@@ -137,6 +137,7 @@ public:
void unwatchFolders(const QStringList &l, Qt4PriFileNode *node);
signals:
+ void proParsingDone();
void proFileUpdated(Qt4ProjectManager::Qt4ProFileNode *node, bool, bool);
void buildDirectoryInitialized();
void fromMapFinished();
--
GitLab