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

Merge remote-tracking branch 'origin/4.6' into 4.7

Browse Source 
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp

Change-Id: I873a2fa112321225e7b478739fc017b01d24ce18
This commit is contained in:
Eike Ziller
2018-05-14 09:44:43 +02:00
parent b67db8bc22 3cfc715d7d
commit 2278ebed1e
17 changed files with 97 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/projectexplorer/runconfiguration.cpp
View File

@@ -921,6 +921,12 @@ RunControl::RunControl(RunConfiguration *runConfiguration, Core::Id mode) :
#endif
}
RunControl::RunControl(const IDevice::ConstPtr &device, Core::Id mode)
: RunControl(nullptr, mode)
{
d->device = device;
}
RunControl::~RunControl()
{
#ifdef WITH_JOURNALD