QmlJS: Fix warnings about duplicate and empty file watchers.

Change-Id: Ia2d5f7588f1a5eb4192526e85b2569b4b175dad2
Reviewed-on: http://codereview.qt.nokia.com/3085
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

1 files changed, 10 insertions, 4 deletions

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