diff options
| author | Jarek Kobus <jkobus@trolltech.com> | 2010-10-14 13:21:28 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-10-15 04:12:57 (GMT) |
| commit | 98161f191ba6f3353404c61829e88419d7c4688a (patch) | |
| tree | 7d77fa996ab23714a4b6537909bc88aea7868108 | |
| parent | 671e13acdd0b5b65e1842bad7e47d2f8c170f586 (diff) | |
| download | Qt-98161f191ba6f3353404c61829e88419d7c4688a.zip Qt-98161f191ba6f3353404c61829e88419d7c4688a.tar.gz Qt-98161f191ba6f3353404c61829e88419d7c4688a.tar.bz2 | |
Workaround for QFileSystemWatcher regression
Don't call removePath() when it was not added before.
Reviewed-by: con <qtc-committer@nokia.com>
Task-number: QTBUG-14435
(cherry picked from commit f38e8394eae20f7290688629ab66720ebacd64c9)
| -rw-r--r-- | tools/designer/src/lib/shared/qtresourcemodel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/designer/src/lib/shared/qtresourcemodel.cpp b/tools/designer/src/lib/shared/qtresourcemodel.cpp index 709f389..e3fc805 100644 --- a/tools/designer/src/lib/shared/qtresourcemodel.cpp +++ b/tools/designer/src/lib/shared/qtresourcemodel.cpp @@ -428,10 +428,10 @@ void QtResourceModelPrivate::removeOldPaths(QtResourceSet *resourceSet, const QS void QtResourceModelPrivate::setWatcherEnabled(const QString &path, bool enable) { - m_fileWatcher->removePath(path); - - if (!enable) + if (!enable) { + m_fileWatcher->removePath(path); return; + } QFileInfo fi(path); if (fi.exists()) |