Update qbs submodule

To HEAD of 1.13 branch. Also adapt to API changes.

Change-Id: Ibe35dfd19dea5f8cde254656cd471618645a0b07
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

src/plugins/qbsprojectmanager/qbsprojectmanager.cpp

@@ -46,7 +46,6 @@
 #include <QVariantMap>
 
 #include <qbs.h>
-#include <qtprofilesetup.h>
 
 const QChar sep = QLatin1Char('.');
 
@@ -166,45 +165,9 @@ void QbsManager::addProfile(const QString &name, const QVariantMap &data)
 
 void QbsManager::addQtProfileFromKit(const QString &profileName, const ProjectExplorer::Kit *k)
 {
-    const QtSupport::BaseQtVersion * const qt = QtSupport::QtKitInformation::qtVersion(k);
+    if (const QtSupport::BaseQtVersion * const qt = QtSupport::QtKitInformation::qtVersion(k)) {
-    if (!qt)
+        qbs::Profile(profileName, settings()).setValue("moduleProviders.Qt.qmakeFilePaths",
-        return;
+                                                       qt->qmakeCommand().toString());
-
-    qbs::QtEnvironment qtEnv;
-    const QList<ProjectExplorer::Abi> abi = qt->qtAbis();
-    if (!abi.empty()) {
-        qtEnv.architecture = ProjectExplorer::Abi::toString(abi.first().architecture());
-        if (abi.first().wordWidth() == 64)
-            qtEnv.architecture.append(QLatin1String("_64"));
-    }
-    qtEnv.binaryPath = qt->binPath().toString();
-    qtEnv.documentationPath = qt->docsPath().toString();
-    qtEnv.includePath = qt->headerPath().toString();
-    qtEnv.libraryPath = qt->libraryPath().toString();
-    qtEnv.pluginPath = qt->pluginPath().toString();
-    qtEnv.mkspecBasePath = qt->mkspecsPath().toString();
-    qtEnv.mkspecName = qt->mkspec().toString();
-    qtEnv.mkspecPath = qt->mkspecPath().toString();
-    qtEnv.qtNameSpace = qt->qtNamespace();
-    qtEnv.qtLibInfix = qt->qtLibInfix();
-    qtEnv.qtVersion = qt->qtVersionString();
-    qtEnv.qtMajorVersion = qt->qtVersion().majorVersion;
-    qtEnv.qtMinorVersion = qt->qtVersion().minorVersion;
-    qtEnv.qtPatchVersion = qt->qtVersion().patchVersion;
-    qtEnv.frameworkBuild = qt->isFrameworkBuild();
-    qtEnv.configItems = qt->configValues();
-    qtEnv.qtConfigItems = qt->qtConfigValues();
-    foreach (const QString &buildVariant,
-            QStringList() << QLatin1String("debug") << QLatin1String("release")) {
-        if (qtEnv.qtConfigItems.contains(buildVariant))
-            qtEnv.buildVariant << buildVariant;
-    }
-    qtEnv.qmlPath = qt->qmlPath().toString();
-    qtEnv.qmlImportPath = qt->qmakeProperty("QT_INSTALL_IMPORTS");
-    const qbs::ErrorInfo errorInfo = qbs::setupQtProfile(profileName, settings(), qtEnv);
-    if (errorInfo.hasError()) {
-        Core::MessageManager::write(tr("Failed to set up kit for Qbs: %1")
-                .arg(errorInfo.toString()), Core::MessageManager::ModeSwitch);
     }
 }
 

src/plugins/qbsprojectmanager/qbsprojectmanager.pro

@@ -5,11 +5,9 @@ isEmpty(QBS_INSTALL_DIR): QBS_INSTALL_DIR = $$(QBS_INSTALL_DIR)
 isEmpty(QBS_INSTALL_DIR) {
     QBS_SOURCE_DIR = $$PWD/../../shared/qbs
     include($$QBS_SOURCE_DIR/src/lib/corelib/use_corelib.pri)
-    include($$QBS_SOURCE_DIR/src/lib/qtprofilesetup/use_qtprofilesetup.pri)
     osx:QMAKE_LFLAGS += -Wl,-rpath,@loader_path/../Frameworks # OS X: fix rpath for qbscore soname
 } else {
     include($${QBS_INSTALL_DIR}/include/qbs/use_installed_corelib.pri)
-    include($${QBS_INSTALL_DIR}/include/qbs/use_installed_qtprofilesetup.pri)
 }
 QBS_INSTALL_DIR_FWD_SLASHES = $$replace(QBS_INSTALL_DIR, \\\\, /)
 DEFINES += QBS_INSTALL_DIR=\\\"$$QBS_INSTALL_DIR_FWD_SLASHES\\\"

src/plugins/qbsprojectmanager/qbsprojectmanager.qbs

@@ -20,7 +20,7 @@ QtcPlugin {
             if (qbs.enableDebugCode)
                 suffix = "d";
         }
-        libs.push("qbscore" + suffix, "qbsqtprofilesetup" + suffix);
+        libs.push("qbscore" + suffix);
         return libs
     }
 
@@ -33,10 +33,6 @@ QtcPlugin {
         name: "qbscore"
         condition: product.useInternalQbsProducts
     }
-    Depends {
-        name: "qbsqtprofilesetup"
-        condition: product.useInternalQbsProducts
-    }
     Depends { name: "QmlJS" }
     Depends { name: "Utils" }
 

src/shared/shared.pro

@@ -2,17 +2,14 @@ TEMPLATE = subdirs
 
 QBS_DIRS = \
     qbscorelib \
-    qbsqtprofilesetup \
     qbsapps \
     qbslibexec \
     qbsplugins \
     qbsstatic
 
 qbscorelib.subdir = qbs/src/lib/corelib
-qbsqtprofilesetup.subdir = qbs/src/lib/qtprofilesetup
-qbsqtprofilesetup.depends = qbscorelib
 qbsapps.subdir = qbs/src/app
-qbsapps.depends = qbsqtprofilesetup
+qbsapps.depends = qbscorelib
 qbslibexec.subdir = qbs/src/libexec
 qbslibexec.depends = qbscorelib
 qbsplugins.subdir = qbs/src/plugins