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

Code cosmetics

Browse Source
This commit is contained in:
Thorbjørn Lindeijer
2011-02-16 10:02:30 +01:00
parent 3179e4642c
commit 7741db1220
8 changed files with 23 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
View File

@@ -154,12 +154,8 @@ bool QmlRunControlFactory::canRun(RunConfiguration *runConfiguration,
if (config && qmlDebugSupportInstalled) {
if (!config->observerPath().isEmpty())
return true;
if (config->qtVersion() && Qt4ProjectManager::QmlObserverTool::canBuild(config->qtVersion())) {
if (config->qtVersion() && Qt4ProjectManager::QmlObserverTool::canBuild(config->qtVersion()))
return true;
} else {
return false;
}
}
return false;
@@ -172,11 +168,10 @@ RunControl *QmlRunControlFactory::create(RunConfiguration *runConfiguration,
QmlProjectRunConfiguration *config = qobject_cast<QmlProjectRunConfiguration *>(runConfiguration);
RunControl *runControl = 0;
if (mode == ProjectExplorer::Constants::RUNMODE) {
runControl = new QmlRunControl(config, mode);
} else if (mode == Debugger::Constants::DEBUGMODE) {
if (mode == ProjectExplorer::Constants::RUNMODE)
runControl = new QmlRunControl(config, mode);
else if (mode == Debugger::Constants::DEBUGMODE)
runControl = createDebugRunControl(config);
}
return runControl;
}
@@ -212,7 +207,8 @@ RunControl *QmlRunControlFactory::createDebugRunControl(QmlProjectRunConfigurati
return Debugger::DebuggerPlugin::createDebugger(params, runConfig);
}
void QmlRunControlFactory::showQmlObserverToolWarning() {
void QmlRunControlFactory::showQmlObserverToolWarning()
{
QMessageBox dialog(QApplication::activeWindow());
QPushButton *qtPref = dialog.addButton(tr("Open Qt4 Options"),
QMessageBox::ActionRole);
@@ -236,4 +232,3 @@ void QmlRunControlFactory::showQmlObserverToolWarning() {
} // namespace Internal
} // namespace QmlProjectManager