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

Merge remote-tracking branch 'origin/4.11'

Browse Source 
Conflicts:
	src/plugins/genericprojectmanager/genericprojectplugin.cpp
	src/plugins/projectexplorer/environmentaspect.cpp
	src/plugins/projectexplorer/environmentaspect.h
	src/plugins/projectexplorer/environmentaspectwidget.cpp

Change-Id: Id21d62cf14419febd1e06c9b429fcdf4501c0eaf
This commit is contained in:
Eike Ziller
2019-11-11 12:58:11 +01:00
parent a504472790 c6115771f9
commit 646c7860cb
114 changed files with 4948 additions and 764 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/ios/iosbuildstep.cpp
View File

@@ -79,14 +79,14 @@ public:
: BuildStepConfigWidget(buildStep), m_buildStep(buildStep)
{
auto buildArgumentsLabel = new QLabel(this);
buildArgumentsLabel->setText(tr("Base arguments:"));
buildArgumentsLabel->setText(IosBuildStep::tr("Base arguments:"));
m_buildArgumentsTextEdit = new QPlainTextEdit(this);
m_buildArgumentsTextEdit->setPlainText(QtcProcess::joinArgs(m_buildStep->baseArguments()));
m_resetDefaultsButton = new QPushButton(this);
m_resetDefaultsButton->setLayoutDirection(Qt::RightToLeft);
m_resetDefaultsButton->setText(tr("Reset Defaults"));
m_resetDefaultsButton->setText(IosBuildStep::tr("Reset Defaults"));
m_resetDefaultsButton->setEnabled(!m_buildStep->m_useDefaultArguments);
auto extraArgumentsLabel = new QLabel(this);
@@ -101,9 +101,9 @@ public:
gridLayout->addWidget(extraArgumentsLabel, 2, 0, 1, 1);
gridLayout->addWidget(m_extraArgumentsLineEdit, 2, 1, 1, 1);
extraArgumentsLabel->setText(tr("Extra arguments:"));
extraArgumentsLabel->setText(IosBuildStep::tr("Extra arguments:"));
setDisplayName(tr("iOS build", "iOS BuildStep display name."));
setDisplayName(IosBuildStep::tr("iOS build", "iOS BuildStep display name."));
updateDetails();