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

Merge remote-tracking branch 'origin/3.3'

Browse Source 
Conflicts:
	src/plugins/coreplugin/coreplugin.cpp
	src/plugins/coreplugin/themesettingswidget.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.h
	src/plugins/qmlprofiler/qml/Overview.js
	src/shared/qbs

Change-Id: Ibe92c166fc5bfbcb4d6964e50ca7298d8459d60e
This commit is contained in:
Eike Ziller
2014-11-24 15:43:48 +01:00
parent 63487158f1 a4a4f7a475
commit a47fbb8309
310 changed files with 5678 additions and 8466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -177,7 +177,8 @@ void QbsProfilesSettingsWidget::displayCurrentProfile()
return;
const Core::Id kitId = Core::Id::fromSetting(m_ui.kitsComboBox->currentData());
const ProjectExplorer::Kit * const kit = ProjectExplorer::KitManager::find(kitId);
const QString profileName = QbsManager::profileForKit(kit);
QTC_ASSERT(kit, return);
const QString profileName = QString::fromLatin1("qtc_") + kit->fileSystemFriendlyName();
m_ui.profileValueLabel->setText(profileName);
for (int i = 0; i < m_model.rowCount(); ++i) {
const QModelIndex profilesIndex = m_model.index(i, 0);
@@ -225,8 +226,8 @@ void QbsProfilesSettingsWidget::mergeCustomPropertiesIntoModel()
const Core::Id kitId = it.key();
const ProjectExplorer::Kit * const kit = ProjectExplorer::KitManager::find(kitId);
QTC_ASSERT(kit, continue);
const QString keyPrefix = QLatin1String("profiles.") + QbsManager::profileForKit(kit)
+ QLatin1Char('.');
const QString keyPrefix = QLatin1String("profiles.")
+ QString::fromLatin1("qtc_") + kit->fileSystemFriendlyName() + QLatin1Char('.');
for (QVariantMap::ConstIterator it2 = it.value().constBegin(); it2 != it.value().constEnd();
++it2) {
customProperties.insert(keyPrefix + it2.key(), it2.value());