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

2 files changed, 4 insertions, 2 deletions

diff --git a/src/plugins/webassembly/webassemblyrunconfiguration.cpp b/src/plugins/webassembly/webassemblyrunconfiguration.cpp
index f4c56630fd..9e0b318547 100644
--- a/src/plugins/webassembly/webassemblyrunconfiguration.cpp
+++ b/src/plugins/webassembly/webassemblyrunconfiguration.cpp
@@ -68,7 +68,7 @@ public:
         auto webBrowserAspect = addAspect<WebBrowserSelectionAspect>(target);
 
         auto effectiveEmrunCall = addAspect<BaseStringAspect>();
-        effectiveEmrunCall->setLabelText(tr("Effective emrun call:"));
+        effectiveEmrunCall->setLabelText(EmrunRunConfigurationFactory::tr("Effective emrun call:"));
         effectiveEmrunCall->setDisplayStyle(BaseStringAspect::TextEditDisplay);
         effectiveEmrunCall->setReadOnly(true);
 
@@ -117,7 +117,7 @@ RunWorkerFactory::WorkerCreator makeEmrunWorker()
 // Factories
 
 EmrunRunConfigurationFactory::EmrunRunConfigurationFactory()
-    : FixedRunConfigurationFactory(EmrunRunConfiguration::tr("Launch with emrun"))
+    : FixedRunConfigurationFactory(EmrunRunConfigurationFactory::tr("Launch with emrun"))
 {
     registerRunConfiguration<EmrunRunConfiguration>(Constants::WEBASSEMBLY_RUNCONFIGURATION_EMRUN);
     addSupportedTargetDeviceType(Constants::WEBASSEMBLY_DEVICE_TYPE);
diff --git a/src/plugins/webassembly/webassemblyrunconfiguration.h b/src/plugins/webassembly/webassemblyrunconfiguration.h
index af6af51e81..d58db86d3c 100644
--- a/src/plugins/webassembly/webassemblyrunconfiguration.h
+++ b/src/plugins/webassembly/webassemblyrunconfiguration.h
@@ -33,6 +33,8 @@ namespace Internal {
 
 class EmrunRunConfigurationFactory : public ProjectExplorer::FixedRunConfigurationFactory
 {
+    Q_DECLARE_TR_FUNCTIONS(WebAssembly::Internal::EmrunRunConfigurationFactory)
+
 public:
     EmrunRunConfigurationFactory();
 };