Merge commit 'origin/master' into cltool2

1 files changed, 6 insertions, 2 deletions

diff --git a/libcontextsubscriber/src/infoxmlbackend.cpp b/libcontextsubscriber/src/infoxmlbackend.cpp
index d7dfb460..65083c1c 100644
--- a/libcontextsubscriber/src/infoxmlbackend.cpp
+++ b/libcontextsubscriber/src/infoxmlbackend.cpp
@@ -211,8 +211,12 @@ void InfoXmlBackend::regenerateKeyDataList()
     if (watchedFiles.size() > 0)
         watcher.removePaths(watchedFiles);
 
-    contextDebug() << F_XML << "Reading core declarations from:" << InfoXmlBackend::coreDeclPath();
-    readKeyDataFromXml (InfoXmlBackend::coreDeclPath());
+    if (QFile(InfoXmlBackend::coreDeclPath()).exists()) {
+        contextDebug() << F_XML << "Reading core declarations from:" << InfoXmlBackend::coreDeclPath();
+        readKeyDataFromXml (InfoXmlBackend::coreDeclPath());
+    } else {
+        contextDebug() << F_XML << "Core declarations file" << InfoXmlBackend::coreDeclPath() << "does not exist.";
+    }
 
     contextDebug() << F_XML << "Re-reading xml contents from" << InfoXmlBackend::registryPath();