Fixed qml inspector to work when debugging qml projects

This commit is contained in:
Lasse Holmstedt
2010-02-24 11:30:32 +01:00
parent fab70e72eb
commit 52bf558e4b

View File

@@ -37,6 +37,10 @@
#include <projectexplorer/applicationlauncher.h> #include <projectexplorer/applicationlauncher.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <debugger/debuggerconstants.h>
#include <debugger/debuggeruiswitcher.h>
#include <qmlinspector/qmlinspectorconstants.h>
#include <QDir> #include <QDir>
#include <QLabel> #include <QLabel>
@@ -77,6 +81,9 @@ void QmlRunControl::start()
{ {
m_applicationLauncher.start(ProjectExplorer::ApplicationLauncher::Gui, m_executable, m_applicationLauncher.start(ProjectExplorer::ApplicationLauncher::Gui, m_executable,
m_commandLineArguments); m_commandLineArguments);
Debugger::DebuggerUISwitcher::instance()->setActiveLanguage(Qml::Constants::LANG_QML);
emit started(); emit started();
emit addToOutputWindow(this, tr("Starting %1 %2").arg(QDir::toNativeSeparators(m_executable), emit addToOutputWindow(this, tr("Starting %1 %2").arg(QDir::toNativeSeparators(m_executable),
m_commandLineArguments.join(QLatin1String(" ")))); m_commandLineArguments.join(QLatin1String(" "))));
@@ -107,7 +114,7 @@ void QmlRunControl::slotAddToOutputWindow(const QString &line)
{ {
if (m_debugMode && line.startsWith("QmlDebugServer: Waiting for connection")) { if (m_debugMode && line.startsWith("QmlDebugServer: Waiting for connection")) {
Core::ICore *core = Core::ICore::instance(); Core::ICore *core = Core::ICore::instance();
core->modeManager()->activateMode(QLatin1String("QML_INSPECT_MODE")); core->modeManager()->activateMode(Debugger::Constants::MODE_DEBUG);
} }
emit addToOutputWindowInline(this, line); emit addToOutputWindowInline(this, line);