feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Update qbs submodule

Browse Source 
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>
This commit is contained in:
Christian Kandeler
2018-01-22 16:45:49 +01:00
parent 7743532c7c
commit ff0d67dcd2
5 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs
View File

@@ -14,7 +14,7 @@ Module {
? ["@loader_path/" + FileInfo.relativePath('/' + appInstallDir, '/' + libInstallDir)] ? ["@loader_path/" + FileInfo.relativePath('/' + appInstallDir, '/' + libInstallDir)]
: ["$ORIGIN/..", "$ORIGIN/../" + qtc.ide_library_path] : ["$ORIGIN/..", "$ORIGIN/../" + qtc.ide_library_path]
property string resourcesInstallDir: qtc.ide_data_path + "/qbs" 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 appInstallDir: qtc.ide_bin_path
property string libexecInstallDir: qtc.ide_libexec_path property string libexecInstallDir: qtc.ide_libexec_path
property bool installHtml: false property bool installHtml: false

2
src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp
View File

@@ -109,7 +109,7 @@ QbsProfilesSettingsWidget::QbsProfilesSettingsWidget(QWidget *parent)
m_ui.settingsDirCheckBox->setText(tr("Store profiles in %1 settings directory") m_ui.settingsDirCheckBox->setText(tr("Store profiles in %1 settings directory")
.arg(Core::Constants::IDE_DISPLAY_NAME)); .arg(Core::Constants::IDE_DISPLAY_NAME));
m_ui.settingsDirCheckBox->setChecked(QbsProjectManagerSettings::useCreatorSettingsDirForQbs()); 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, connect(ProjectExplorer::KitManager::instance(), &ProjectExplorer::KitManager::kitsChanged,
this, &QbsProfilesSettingsWidget::refreshKitsList); this, &QbsProfilesSettingsWidget::refreshKitsList);
connect(m_ui.settingsDirCheckBox, &QCheckBox::stateChanged, [this]() { connect(m_ui.settingsDirCheckBox, &QCheckBox::stateChanged, [this]() {

2
src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
View File

@@ -246,7 +246,7 @@ void QbsRunConfiguration::addToBaseEnvironment(Utils::Environment &env) const
QProcessEnvironment procEnv = env.toProcessEnvironment(); QProcessEnvironment procEnv = env.toProcessEnvironment();
procEnv.insert(QLatin1String("QBS_RUN_FILE_PATH"), executable()); procEnv.insert(QLatin1String("QBS_RUN_FILE_PATH"), executable());
qbs::RunEnvironment qbsRunEnv = project->qbsProject().getRunEnvironment(product, qbs::RunEnvironment qbsRunEnv = project->qbsProject().getRunEnvironment(product,
qbs::InstallOptions(), procEnv, QbsManager::settings()); qbs::InstallOptions(), procEnv, QStringList(), QbsManager::settings());
qbs::ErrorInfo error; qbs::ErrorInfo error;
procEnv = qbsRunEnv.runEnvironment(&error); procEnv = qbsRunEnv.runEnvironment(&error);
if (error.hasError()) { if (error.hasError()) {

2
src/shared/qbs

Submodule src/shared/qbs updated: d3e137c202...6655d563c3

1
src/src.qbs
View File

@@ -35,6 +35,7 @@ Project {
qbsBaseDir + "/src/plugins/plugins.qbs", qbsBaseDir + "/src/plugins/plugins.qbs",
qbsBaseDir + "/share/share.qbs", qbsBaseDir + "/share/share.qbs",
qbsBaseDir + "/src/app/apps.qbs", qbsBaseDir + "/src/app/apps.qbs",
qbsBaseDir + "/src/shared/bundledqt/bundledqt.qbs",
qbsBaseDir + "/src/shared/json/json.qbs", qbsBaseDir + "/src/shared/json/json.qbs",
] ]
} }