feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlJS: Fix warnings about duplicate and empty file watchers.

Browse Source 
Change-Id: Ia2d5f7588f1a5eb4192526e85b2569b4b175dad2
Reviewed-on: http://codereview.qt.nokia.com/3085
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Christian Kamm
2011-08-17 11:59:15 +02:00
parent 30eefea9fd
commit 8fbaa0d10a
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/qmljstools/qmljsplugindumper.cpp
View File

@@ -162,15 +162,21 @@ void PluginDumper::onLoadPluginTypes(const QString &libraryPath, const QString &
// watch plugin libraries // watch plugin libraries
foreach (const QmlDirParser::Plugin &plugin, snapshot.libraryInfo(canonicalLibraryPath).plugins()) { foreach (const QmlDirParser::Plugin &plugin, snapshot.libraryInfo(canonicalLibraryPath).plugins()) {
const QString pluginLibrary = resolvePlugin(canonicalLibraryPath, plugin.path, plugin.name); const QString pluginLibrary = resolvePlugin(canonicalLibraryPath, plugin.path, plugin.name);
pluginWatcher()->addFile(pluginLibrary, Utils::FileSystemWatcher::WatchModifiedDate); if (!pluginLibrary.isEmpty()) {
m_libraryToPluginIndex.insert(pluginLibrary, index); if (!pluginWatcher()->watchesFile(pluginLibrary))
pluginWatcher()->addFile(pluginLibrary, Utils::FileSystemWatcher::WatchModifiedDate);
m_libraryToPluginIndex.insert(pluginLibrary, index);
}
} }
// watch library xml file // watch library xml file
if (plugin.hasPredumpedQmlTypesFile()) { if (plugin.hasPredumpedQmlTypesFile()) {
const QString &path = plugin.predumpedQmlTypesFilePath(); const QString &path = plugin.predumpedQmlTypesFilePath();
pluginWatcher()->addFile(path, Utils::FileSystemWatcher::WatchModifiedDate); if (!path.isEmpty()) {
m_libraryToPluginIndex.insert(path, index); if (!pluginWatcher()->watchesFile(path))
pluginWatcher()->addFile(path, Utils::FileSystemWatcher::WatchModifiedDate);
m_libraryToPluginIndex.insert(path, index);
}
} }
dump(plugin); dump(plugin);