Merge 1.8 into master

Change-Id: Ie4ec88083aa4c85bbe872d8dc175960292f75d5c

1 files changed, 10 insertions, 5 deletions

diff --git a/src/lib/corelib/api/project.cpp b/src/lib/corelib/api/project.cpp
index 1508c34e9..628ccb20c 100644
--- a/src/lib/corelib/api/project.cpp
+++ b/src/lib/corelib/api/project.cpp
@@ -304,12 +304,17 @@ void ProjectPrivate::setupInstallData(ArtifactData &artifact,
                 QLatin1String("qbs"), QLatin1String("installRoot")).toString();
     InstallOptions options;
     options.setInstallRoot(installRoot);
-    QString installFilePath = ProductInstaller::targetFilePath(product->topLevelProject(),
-            product->sourceDirectory, artifact.filePath(), artifact.properties().d->m_map, options);
-    if (!installRoot.isEmpty())
-        installFilePath.remove(0, installRoot.count());
     artifact.d->installData.d->installRoot = installRoot;
-    artifact.d->installData.d->installFilePath = installFilePath;
+    try {
+        QString installFilePath = ProductInstaller::targetFilePath(product->topLevelProject(),
+                product->sourceDirectory, artifact.filePath(), artifact.properties().d->m_map,
+                options);
+        if (!installRoot.isEmpty())
+            installFilePath.remove(0, installRoot.count());
+        artifact.d->installData.d->installFilePath = installFilePath;
+    } catch (const ErrorInfo &e) {
+        logger.printWarning(e);
+    }
 }
 
 #ifdef QBS_ENABLE_PROJECT_FILE_UPDATES