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/designer/codemodelhelpers.cpp

Change-Id: I78906f2fbbfd27d254589a272ebca423b0b80699
This commit is contained in:
Eike Ziller
2019-11-28 08:24:10 +01:00
parent 2059cb31f0 6b1d54421e
commit 6fc85b49fa
125 changed files with 2380 additions and 881 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/mcusupport/mcusupportrunconfiguration.cpp
View File

@@ -103,7 +103,7 @@ RunWorkerFactory::WorkerCreator makeFlashAndRunWorker()
return RunWorkerFactory::make<FlashAndRunWorker>();
}
EmrunRunConfigurationFactory::EmrunRunConfigurationFactory()
McuSupportRunConfigurationFactory::McuSupportRunConfigurationFactory()
: FixedRunConfigurationFactory(FlashAndRunConfiguration::tr("Flash and run"))
{
registerRunConfiguration<FlashAndRunConfiguration>(Constants::RUNCONFIGURATION);