Merge remote-tracking branch 'origin/4.11'

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

Change-Id: Id21d62cf14419febd1e06c9b429fcdf4501c0eaf

1 files changed, 4 insertions, 4 deletions

diff --git a/src/plugins/ios/iosbuildstep.cpp b/src/plugins/ios/iosbuildstep.cpp
index 2ca3db27437..bbcc3937f6c 100644
--- a/src/plugins/ios/iosbuildstep.cpp
+++ b/src/plugins/ios/iosbuildstep.cpp
@@ -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();