diff --git a/src/plugins/qmlinspector/qmlinspector.pro b/src/plugins/qmlinspector/qmlinspector.pro index 55becbd1b6e217b59c6efc67e682acd67f4a58c0..0a2807f8fff3826c010d463ad61b9eb7e13c7b88 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 b34b9b61687c0253ad32ef83f4148750275a3af9..0d3b72b3d359bb076db6065cdf377dad98a186c3 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 0000000000000000000000000000000000000000..fc1adf24f3e441ba4d3ad8a3bc2abcbdeb3917ee --- /dev/null +++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.pri @@ -0,0 +1,2 @@ +include(qmlprojectmanager_dependencies.pri) +LIBS *= -l$$qtLibraryTarget(QmlProjectManager)