diff options
author | Kai Koehne <kai.koehne@nokia.com> | 2011-09-15 13:05:36 +0200 |
---|---|---|
committer | Kai Koehne <kai.koehne@nokia.com> | 2011-09-19 17:01:53 +0200 |
commit | cccad7432d99064fa7cf61943a0630e7adf54d51 (patch) | |
tree | b70996e82646e7fab181ef0da0959cb9a03dcc8a /src/plugins/qmlprojectmanager/qmlprojectfile.cpp | |
parent | 9a142208433bfb2000a4d81f151a90b46af0fb17 (diff) | |
download | qt-creator-cccad7432d99064fa7cf61943a0630e7adf54d51.tar.gz |
QmlProjectManager: Make sure project tree updates after in project file change
Use FileManager instead of our own FileSystemWatcher, since this one only signals
the first file change (cause Qt Creator apparently removes the file and creates
a new one on each change).
Change-Id: Idacd545e41cd3ee29bfbc122526b9097039c65d0
Reviewed-on: http://codereview.qt-project.org/4975
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Diffstat (limited to 'src/plugins/qmlprojectmanager/qmlprojectfile.cpp')
-rw-r--r-- | src/plugins/qmlprojectmanager/qmlprojectfile.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlprojectfile.cpp b/src/plugins/qmlprojectmanager/qmlprojectfile.cpp index 44189f12f3..4fd10bba86 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectfile.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectfile.cpp @@ -33,6 +33,7 @@ #include "qmlprojectfile.h" #include "qmlproject.h" #include "qmlprojectconstants.h" +#include <utils/qtcassert.h> namespace QmlProjectManager { namespace Internal { @@ -41,10 +42,14 @@ QmlProjectFile::QmlProjectFile(QmlProject *parent, QString fileName) : Core::IFile(parent), m_project(parent), m_fileName(fileName) -{ } +{ + QTC_CHECK(m_project); + QTC_CHECK(!fileName.isEmpty()); +} QmlProjectFile::~QmlProjectFile() -{ } +{ +} bool QmlProjectFile::save(QString *, const QString &, bool) { @@ -104,7 +109,10 @@ bool QmlProjectFile::reload(QString *errorString, ReloadFlag flag, ChangeType ty { Q_UNUSED(errorString) Q_UNUSED(flag) - Q_UNUSED(type) + + if (type == TypeContents) + m_project->refreshProjectFile(); + return true; } |