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

Merge remote-tracking branch 'origin/4.10'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/projectexplorer/gcctoolchain.cpp
	src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp

Change-Id: Iffdf48e782a734107ea170ebb3812e997cea0e7b
This commit is contained in:
Eike Ziller
2019-09-12 09:08:04 +02:00
parent 3a5ca31a7e a21df46481
commit 8df0653bf8
39 changed files with 234 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmlpreview/qmlpreviewruncontrol.cpp
View File

@@ -73,7 +73,7 @@ QmlPreviewRunner::QmlPreviewRunner(ProjectExplorer::RunControl *runControl,
});
connect(&m_connectionManager, &Internal::QmlPreviewConnectionManager::restart,
runControl, [runControl]() {
runControl, [this, runControl]() {
if (!runControl->isRunning())
return;