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

Merge remote-tracking branch 'origin/4.4'

Browse Source 
Conflicts:
	src/tools/clangbackend/ipcsource/clangiasyncjob.cpp
	src/tools/clangbackend/ipcsource/clangjobrequest.cpp
	src/tools/clangbackend/ipcsource/clangjobrequest.h

Change-Id: Ib8602530663813ade418f995dfd2a736908cfe75
This commit is contained in:
Eike Ziller
2017-08-15 10:07:51 +02:00
parent e6a50fd44a 885f8b5385
commit d8fd5292f1
209 changed files with 5006 additions and 2423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/ios/iosrunner.cpp
View File

@@ -394,10 +394,10 @@ IosQmlProfilerSupport::IosQmlProfilerSupport(RunControl *runControl)
m_runner = new IosRunner(runControl);
m_runner->setQmlDebugging(QmlDebug::QmlProfilerServices);
addDependency(m_runner);
addStartDependency(m_runner);
m_profiler = runControl->createWorker(runControl->runMode());
m_profiler->addDependency(this);
m_profiler->addStartDependency(this);
}
void IosQmlProfilerSupport::start()
@@ -428,7 +428,7 @@ IosDebugSupport::IosDebugSupport(RunControl *runControl)
m_runner->setCppDebugging(isCppDebugging());
m_runner->setQmlDebugging(isQmlDebugging() ? QmlDebug::QmlDebuggerServices : QmlDebug::NoQmlDebugServices);
addDependency(m_runner);
addStartDependency(m_runner);
}
void IosDebugSupport::start()

4
src/plugins/ios/iossettingswidget.cpp
View File

@@ -185,7 +185,7 @@ void IosSettingsWidget::onReset()
const int userInput = QMessageBox::question(this, tr("Reset"),
tr("Do you really want to reset the contents and settings"
" of the selected devices", "",
" of the selected devices?", "",
simulatorInfoList.count()));
if (userInput == QMessageBox::No)
return;
@@ -243,7 +243,7 @@ void IosSettingsWidget::onDelete()
const int userInput = QMessageBox::question(this, tr("Delete Device"),
tr("Do you really want to delete the selected "
"devices", "", simulatorInfoList.count()));
"devices?", "", simulatorInfoList.count()));
if (userInput == QMessageBox::No)
return;