Commit 940fb1c4 authored by Christian Kamm's avatar Christian Kamm Committed by Daniel Teske
Browse files

Qt4Project: Update code models if a folder watch changes the file list.

Fixes: c861af52

Change-Id: I7ed8afd52ab694d053788fac7f3e994898f2dd84
Reviewed-on: http://codereview.qt-project.org/4969

Reviewed-by: default avatarDaniel Teske <daniel.teske@nokia.com>
parent cdbd3904
......@@ -733,6 +733,7 @@ void Qt4PriFileNode::folderChanged(const QString &folder)
contents.updateSubFolders(this, this);
m_project->updateFileList();
m_project->updateCodeModels();
// The files to be packaged are listed inside the symbian build system.
// We need to regenerate that list by running qmake
......
......@@ -353,7 +353,6 @@ void Qt4Project::updateFileList()
if (newFiles != *m_projectFiles) {
*m_projectFiles = newFiles;
emit fileListChanged();
updateCodeModels();
if (debug)
qDebug() << Q_FUNC_INFO << *m_projectFiles;
}
......@@ -393,6 +392,8 @@ 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();
......@@ -798,6 +799,7 @@ void Qt4Project::decrementPendingEvaluateFutures()
foreach (Target *t, targets())
static_cast<Qt4BaseTarget *>(t)->createApplicationProFiles();
updateFileList();
updateCodeModels();
if (debug)
qDebug()<<" Setting state to Base";
m_asyncUpdateState = Base;
......
......@@ -131,6 +131,7 @@ public:
// For Qt4ProFileNode after a on disk change
void updateFileList();
void updateCodeModels();
void watchFolders(const QStringList &l, Qt4PriFileNode *node);
void unwatchFolders(const QStringList &l, Qt4PriFileNode *node);
......@@ -158,7 +159,6 @@ private slots:
private:
void scheduleAsyncUpdate();
void updateCodeModels();
void updateCppCodeModel();
void updateQmlJSCodeModel();
......
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