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

projectexplorer: remove useQmlDebugger from generic RunConfiguration

Browse Source 
Change-Id: I9eb046348d4b56e64ffc2a2beb057d2fe090f8c3
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
This commit is contained in:
hjk
2012-02-23 13:36:09 +01:00
committed by hjk
parent fbeeac5672
commit 21558fa5d0
8 changed files with 39 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -198,7 +198,8 @@ bool ProcessHandle::equals(const ProcessHandle &rhs) const
\class ProjectExplorer::DebuggerProjectSettings
*/
DebuggerProjectSettings::DebuggerProjectSettings() :
DebuggerProjectSettings::DebuggerProjectSettings(RunConfiguration *rc) :
m_runConfiguration(rc),
m_useCppDebugger(true),
m_useQmlDebugger(AutoEnableQmlDebugger),
m_qmlDebugServerPort(Constants::QML_DEFAULT_DEBUG_SERVER_PORT),
@@ -206,11 +207,17 @@ DebuggerProjectSettings::DebuggerProjectSettings() :
{}
DebuggerProjectSettings::DebuggerProjectSettings(DebuggerProjectSettings *other) :
m_runConfiguration(other->m_runConfiguration),
m_useCppDebugger(other->m_useCppDebugger),
m_useQmlDebugger(other->m_useQmlDebugger),
m_qmlDebugServerPort(other->m_qmlDebugServerPort)
{}
RunConfiguration *DebuggerProjectSettings::runConfiguration()
{
return m_runConfiguration;
}
void DebuggerProjectSettings::setUseQmlDebugger(bool value)
{
m_useQmlDebugger = value ? EnableQmlDebugger : DisableQmlDebugger;
@@ -235,17 +242,11 @@ static bool isQtQuickAppProject(Project *project)
return project->files(Project::ExcludeGeneratedFiles).contains(filePath);
}
DebuggerProjectSettings::QmlDebuggerStatus DebuggerProjectSettings::useQmlDebugger() const
bool DebuggerProjectSettings::useQmlDebugger() const
{
return m_useQmlDebugger;
}
bool RunConfiguration::useQmlDebugger() const
{
DebuggerProjectSettings::QmlDebuggerStatus s = m_debuggerAspect->useQmlDebugger();
if (s == DebuggerProjectSettings::AutoEnableQmlDebugger)
return isQtQuickAppProject(target()->project());
return s == DebuggerProjectSettings::EnableQmlDebugger;
if (m_useQmlDebugger == DebuggerProjectSettings::AutoEnableQmlDebugger)
return isQtQuickAppProject(m_runConfiguration->target()->project());
return m_useQmlDebugger == DebuggerProjectSettings::EnableQmlDebugger;
}
uint DebuggerProjectSettings::qmlDebugServerPort() const
@@ -253,6 +254,11 @@ uint DebuggerProjectSettings::qmlDebugServerPort() const
return m_qmlDebugServerPort;
}
void DebuggerProjectSettings::setQmllDebugServerPort(uint port)
{
m_qmlDebugServerPort = port;
}
void DebuggerProjectSettings::suppressQmlDebuggingOptions()
{
m_suppressQmlDebuggingOptions = true;
@@ -306,7 +312,7 @@ void DebuggerProjectSettings::fromMap(const QVariantMap &map)
RunConfiguration::RunConfiguration(Target *target, const QString &id) :
ProjectConfiguration(target, id),
m_debuggerAspect(new DebuggerProjectSettings)
m_debuggerAspect(new DebuggerProjectSettings(this))
{
Q_ASSERT(target);
addExtraAspects();