Skip to content
Snippets Groups Projects
Commit 52bf558e authored by Lasse Holmstedt's avatar Lasse Holmstedt
Browse files

Fixed qml inspector to work when debugging qml projects

parent fab70e72
No related branches found
No related tags found
No related merge requests found
...@@ -37,6 +37,10 @@ ...@@ -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() ...@@ -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) ...@@ -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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment