diff options
| author | Jarek Kobus <jkobus@trolltech.com> | 2010-10-14 13:21:28 (GMT) |
|---|---|---|
| committer | Jarek Kobus <jkobus@trolltech.com> | 2010-10-14 13:23:25 (GMT) |
| commit | f38e8394eae20f7290688629ab66720ebacd64c9 (patch) | |
| tree | e8beaf0b3499dda5ade45b99b07719509fd88086 /tools | |
| parent | c0fd373d61c0ed7e9528203d658a5b55dcd1e618 (diff) | |
| download | Qt-f38e8394eae20f7290688629ab66720ebacd64c9.zip Qt-f38e8394eae20f7290688629ab66720ebacd64c9.tar.gz Qt-f38e8394eae20f7290688629ab66720ebacd64c9.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
Diffstat (limited to 'tools')
| -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()) |