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

Qml Debugger: Code style and cleanup

Browse Source 
Reviewed-by: hjk
This commit is contained in:
Lasse Holmstedt
2010-08-24 17:17:54 +02:00
parent 290835300d
commit 7afef49682
16 changed files with 168 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/plugins/debugger/debuggerrunner.cpp
View File

@@ -229,8 +229,9 @@ DebuggerRunControl::DebuggerRunControl(RunConfiguration *runConfiguration,
{
connect(this, SIGNAL(finished()), this, SLOT(handleFinished()));
m_isQmlProject = isQmlProject(runConfiguration);
createEngine(sp);
DebuggerStartParameters startParams = sp;
startParams.m_isQmlProject = isQmlProject(runConfiguration);
createEngine(startParams);
}
DebuggerRunControl::~DebuggerRunControl()
@@ -378,8 +379,8 @@ void DebuggerRunControl::createEngine(const DebuggerStartParameters &startParams
if (!engineType)
engineType = engineForMode(sp.startMode);
if (engineType != QmlEngineType && m_isQmlProject && (activeLangs & Lang_Qml)) {
if (activeLangs & Lang_Cpp) {
if (engineType != QmlEngineType && sp.m_isQmlProject && (activeLangs & QmlLanguage)) {
if (activeLangs & CppLanguage) {
sp.cppEngineType = engineType;
engineType = QmlCppEngineType;
} else {
@@ -596,31 +597,4 @@ bool DebuggerRunControl::isQmlProject(RunConfiguration *config)
return false;
}
bool DebuggerRunControl::isCurrentProjectQmlCppBased()
{
Project *startupProject = ProjectExplorerPlugin::instance()->startupProject();
if (!startupProject)
return false;
if (!startupProject->activeTarget())
return false;
RunConfiguration *rc = startupProject->activeTarget()->activeRunConfiguration();
return isQmlProject(rc);
}
bool DebuggerRunControl::isCurrentProjectCppBased()
{
Project *startupProject = ProjectExplorerPlugin::instance()->startupProject();
if (!startupProject)
return false;
const QString id = startupProject->id();
return id == _("GenericProjectManager.GenericProject")
|| id == _("CMakeProjectManager.CMakeProject")
|| id == _("Qt4ProjectManager.Qt4Project");
}
} // namespace Debugger