diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-01-22 16:45:49 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-01-23 08:55:40 +0000 |
| commit | ff0d67dcd210f7d652799e0d16e1532a52116fcf (patch) | |
| tree | e5751236a5dbf0911ea0cbf7675ed7d6d944d235 | |
| parent | 7743532c7c5596beec8bc5354cc4c6078d81645e (diff) | |
Update qbs submodule
To HEAD of 1.11 branch. Also do the adaptations necessary because of the
branch switch.
Change-Id: Ief69ef014c10397c14fcd68a9ca770d1391d5491
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs | 2 | ||||
| -rw-r--r-- | src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp | 2 | ||||
| m--------- | src/shared/qbs | 0 | ||||
| -rw-r--r-- | src/src.qbs | 1 |
5 files changed, 4 insertions, 3 deletions
diff --git a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs index 492a6fe457..6c77099906 100644 --- a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs +++ b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs @@ -14,7 +14,7 @@ Module { ? ["@loader_path/" + FileInfo.relativePath('/' + appInstallDir, '/' + libInstallDir)] : ["$ORIGIN/..", "$ORIGIN/../" + qtc.ide_library_path] property string resourcesInstallDir: qtc.ide_data_path + "/qbs" - property string pluginsInstallDir: qtc.ide_plugin_path + property string pluginsInstallDir: qtc.ide_plugin_path + "/qbs/plugins" property string appInstallDir: qtc.ide_bin_path property string libexecInstallDir: qtc.ide_libexec_path property bool installHtml: false diff --git a/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp b/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp index 3e7ac54eb4..f0a1fb7235 100644 --- a/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp +++ b/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp @@ -109,7 +109,7 @@ QbsProfilesSettingsWidget::QbsProfilesSettingsWidget(QWidget *parent) m_ui.settingsDirCheckBox->setText(tr("Store profiles in %1 settings directory") .arg(Core::Constants::IDE_DISPLAY_NAME)); m_ui.settingsDirCheckBox->setChecked(QbsProjectManagerSettings::useCreatorSettingsDirForQbs()); - m_ui.versionValueLabel->setText(qbs::LanguageInfo::qbsVersion()); + m_ui.versionValueLabel->setText(qbs::LanguageInfo::qbsVersion().toString()); connect(ProjectExplorer::KitManager::instance(), &ProjectExplorer::KitManager::kitsChanged, this, &QbsProfilesSettingsWidget::refreshKitsList); connect(m_ui.settingsDirCheckBox, &QCheckBox::stateChanged, [this]() { diff --git a/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp index 3c0e2eceac..7702b4551a 100644 --- a/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp +++ b/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp @@ -246,7 +246,7 @@ void QbsRunConfiguration::addToBaseEnvironment(Utils::Environment &env) const QProcessEnvironment procEnv = env.toProcessEnvironment(); procEnv.insert(QLatin1String("QBS_RUN_FILE_PATH"), executable()); qbs::RunEnvironment qbsRunEnv = project->qbsProject().getRunEnvironment(product, - qbs::InstallOptions(), procEnv, QbsManager::settings()); + qbs::InstallOptions(), procEnv, QStringList(), QbsManager::settings()); qbs::ErrorInfo error; procEnv = qbsRunEnv.runEnvironment(&error); if (error.hasError()) { diff --git a/src/shared/qbs b/src/shared/qbs -Subproject d3e137c20248f6852a91341782011ca58534ed2 +Subproject 6655d563c3cac6dbfd61bfb3dd15ae5b9467d5a diff --git a/src/src.qbs b/src/src.qbs index 28246e5476..ff52425d5d 100644 --- a/src/src.qbs +++ b/src/src.qbs @@ -35,6 +35,7 @@ Project { qbsBaseDir + "/src/plugins/plugins.qbs", qbsBaseDir + "/share/share.qbs", qbsBaseDir + "/src/app/apps.qbs", + qbsBaseDir + "/src/shared/bundledqt/bundledqt.qbs", qbsBaseDir + "/src/shared/json/json.qbs", ] } |