Update qbs submodule

To HEAD of master branch. Also do the necessary API adaptations in
QbsProjectManager.

Change-Id: I4709b7a0f35537f5b6f9fd04f4d95be16aef2c8d
Reviewed-by: Jake Petroules <jake.petroules@qt.io>

src/plugins/qbsprojectmanager/qbsnodes.cpp

@@ -454,7 +454,7 @@ void QbsGroupNode::setupFiles(ProjectExplorer::FolderNode *root, const qbs::Grou
     FileTreeNode::simplify(&tree);
 
     QHash<QString, ProjectExplorer::FileType> fileTypeHash;
-    foreach (const qbs::SourceArtifact &sa, group.allSourceArtifacts())
+    foreach (const qbs::ArtifactData &sa, group.allSourceArtifacts())
         fileTypeHash[sa.filePath()] = fileType(sa);
 
     setupFolder(root, fileTypeHash, &tree, productPath, updateExisting);
@@ -548,7 +548,7 @@ void QbsGroupNode::setupFolder(ProjectExplorer::FolderNode *root,
     root->addFileNodes(filesToAdd);
 }
 
-ProjectExplorer::FileType QbsGroupNode::fileType(const qbs::SourceArtifact &artifact)
+ProjectExplorer::FileType QbsGroupNode::fileType(const qbs::ArtifactData &artifact)
 {
     QTC_ASSERT(artifact.isValid(), return ProjectExplorer::UnknownFileType);
 
@@ -712,10 +712,8 @@ QList<ProjectExplorer::RunConfiguration *> QbsProductNode::runConfigurations() c
 {
     QList<ProjectExplorer::RunConfiguration *> result;
     QbsProjectNode *pn = dynamic_cast<QbsProjectNode *>(projectNode());
-    if (!isEnabled() || !pn || !pn->qbsProject().isValid()
+    if (!isEnabled() || m_qbsProductData.targetExecutable().isEmpty())
-            || pn->qbsProject().targetExecutable(m_qbsProductData, qbs::InstallOptions()).isEmpty()) {
         return result;
-    }
 
     foreach (ProjectExplorer::RunConfiguration *rc, pn->project()->activeTarget()->runConfigurations()) {
         QbsRunConfiguration *qbsRc = qobject_cast<QbsRunConfiguration *>(rc);

src/plugins/qbsprojectmanager/qbsnodes.h

@@ -109,7 +109,7 @@ private:
                             const QHash<QString, ProjectExplorer::FileType> &fileTypeHash,
                             const FileTreeNode *subFileTree, const QString &baseDir,
                             bool updateExisting);
-    static ProjectExplorer::FileType fileType(const qbs::SourceArtifact &artifact);
+    static ProjectExplorer::FileType fileType(const qbs::ArtifactData &artifact);
 
     qbs::GroupData m_qbsGroupData;
     QString m_productPath;

src/plugins/qbsprojectmanager/qbsproject.cpp

@@ -752,7 +752,7 @@ void QbsProject::updateDocuments(const QSet<QString> &files)
     m_qbsDocuments.unite(toAdd);
 }
 
-static CppTools::ProjectFile::Kind cppFileType(const qbs::SourceArtifact &sourceFile)
+static CppTools::ProjectFile::Kind cppFileType(const qbs::ArtifactData &sourceFile)
 {
     if (sourceFile.fileTags().contains(QLatin1String("hpp")))
         return CppTools::ProjectFile::CXXHeader;
@@ -857,8 +857,8 @@ void QbsProject::updateCppCodeModel()
             ppBuilder.setDisplayName(grp.name());
             ppBuilder.setProjectFile(groupLocationToProjectFile(grp.location()));
 
-            QHash<QString, qbs::SourceArtifact> filePathToSourceArtifact;
+            QHash<QString, qbs::ArtifactData> filePathToSourceArtifact;
-            foreach (const qbs::SourceArtifact &source, grp.allSourceArtifacts()) {
+            foreach (const qbs::ArtifactData &source, grp.allSourceArtifacts()) {
                 filePathToSourceArtifact.insert(source.filePath(), source);
 
                 foreach (const QString &tag, source.fileTags()) {
@@ -922,7 +922,7 @@ void QbsProject::updateCppCompilerCallData()
             CppTools::ProjectInfo::CompilerCallGroup compilerCallGroup;
             compilerCallGroup.groupId = groupLocationToProjectFile(group.location());
 
-            foreach (const qbs::SourceArtifact &file, group.allSourceArtifacts()) {
+            foreach (const qbs::ArtifactData &file, group.allSourceArtifacts()) {
                 const QString &filePath = file.filePath();
                 if (!CppTools::ProjectFile::isSource(cppFileType(file)))
                     continue;
@@ -984,7 +984,7 @@ void QbsProject::updateApplicationTargets()
                     FileName::fromString(productData.location().filePath()));
             continue;
         }
-        foreach (const qbs::TargetArtifact &ta, productData.targetArtifacts()) {
+        foreach (const qbs::ArtifactData &ta, productData.targetArtifacts()) {
             QTC_ASSERT(ta.isValid(), continue);
             if (!ta.isExecutable())
                 continue;
@@ -1002,9 +1002,8 @@ void QbsProject::updateDeploymentInfo()
     if (m_qbsProject.isValid()) {
         qbs::InstallOptions installOptions;
         installOptions.setInstallRoot(QLatin1String("/"));
-        foreach (const qbs::InstallableFile &f, m_qbsProject
+        foreach (const qbs::ArtifactData &f, m_projectData.installableArtifacts()) {
-                     .installableFilesForProject(m_projectData, installOptions)) {
+            deploymentData.addFile(f.filePath(), f.installData().installDir(),
-            deploymentData.addFile(f.sourceFilePath(), QFileInfo(f.targetFilePath()).path(),
                     f.isExecutable() ? DeployableFile::TypeExecutable : DeployableFile::TypeNormal);
         }
     }

src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp

@@ -250,7 +250,7 @@ QString QbsRunConfiguration::executable() const
     if (!product.isValid() || !pro->qbsProject().isValid())
         return QString();
 
-    return pro->qbsProject().targetExecutable(product, installOptions());
+    return product.targetExecutable();
 }
 
 bool QbsRunConfiguration::isConsoleApplication() const