From c9da13eb211f876aec179d77b0250cb5c841f0dd Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Wed, 13 Jan 2010 11:45:51 +1000
Subject: [PATCH] Use the QmlProject configuration to set the debug server
port.
---
src/plugins/qmlinspector/qmlinspector.pro | 1 +
src/plugins/qmlinspector/qmlinspectormode.cpp | 8 +++++---
src/plugins/qmlprojectmanager/qmlprojectmanager.pri | 2 ++
3 files changed, 8 insertions(+), 3 deletions(-)
create mode 100644 src/plugins/qmlprojectmanager/qmlprojectmanager.pri
diff --git a/src/plugins/qmlinspector/qmlinspector.pro b/src/plugins/qmlinspector/qmlinspector.pro
index 55becbd1b6e..0a2807f8fff 100644
--- a/src/plugins/qmlinspector/qmlinspector.pro
+++ b/src/plugins/qmlinspector/qmlinspector.pro
@@ -20,6 +20,7 @@ RESOURCES += qmlinspector.qrc
include(../../qtcreatorplugin.pri)
include(../../plugins/projectexplorer/projectexplorer.pri)
+include(../../plugins/qmlprojectmanager/qmlprojectmanager.pri)
include(../../plugins/coreplugin/coreplugin.pri)
include(../../plugins/texteditor/texteditor.pri)
diff --git a/src/plugins/qmlinspector/qmlinspectormode.cpp b/src/plugins/qmlinspector/qmlinspectormode.cpp
index b34b9b61687..0d3b72b3d35 100644
--- a/src/plugins/qmlinspector/qmlinspectormode.cpp
+++ b/src/plugins/qmlinspector/qmlinspectormode.cpp
@@ -61,6 +61,8 @@
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/project.h>
+#include <qmlprojectmanager/qmlproject.h>
+
#include <QtCore/QStringList>
#include <QtCore/QtPlugin>
#include <QtCore/QDebug>
@@ -183,15 +185,15 @@ void QmlInspectorMode::connectToViewer()
return;
}
- ProjectExplorer::RunConfiguration* config = project->activeRunConfiguration();
+ QmlProjectManager::QmlRunConfiguration* config =
+ qobject_cast<QmlProjectManager::QmlRunConfiguration*>(project->activeRunConfiguration());
if (!config) {
emit statusMessage(tr("Cannot find project run configuration, debugging canceled."));
return;
}
- // TODO load from QmlProject settings!!
QHostAddress host = QHostAddress::LocalHost;
- quint16 port = 3768;
+ quint16 port = quint16(config->debugServerPort());
m_conn = new QmlDebugConnection(this);
connect(m_conn, SIGNAL(stateChanged(QAbstractSocket::SocketState)),
diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.pri b/src/plugins/qmlprojectmanager/qmlprojectmanager.pri
new file mode 100644
index 00000000000..fc1adf24f3e
--- /dev/null
+++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.pri
@@ -0,0 +1,2 @@
+include(qmlprojectmanager_dependencies.pri)
+LIBS *= -l$$qtLibraryTarget(QmlProjectManager)
--
GitLab