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

QML Observer: Build together on runtime with debugging tools

Browse Source 
Moved qmljsdebugger to a dir under qml/, made qmlobserver compile
without creator dependencies and made it compile with debugging
helpers.

Reviewed-by: hjk
This commit is contained in:
Lasse Holmstedt
2010-09-27 17:22:57 +02:00
parent 5d9858129a
commit 96d991bbdc
110 changed files with 1061 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/qmljseditor/qmljsmodelmanager.cpp
View File

@@ -42,7 +42,6 @@
#include <texteditor/itexteditor.h>
#include <projectexplorer/project.h>
#include <projectexplorer/projectexplorer.h>
#include <qt4projectmanager/qmldumptool.h>
#include <QDir>
#include <QFile>
@@ -474,25 +473,13 @@ void ModelManager::onLoadPluginTypes(const QString &libraryPath, const QString &
if (m_runningQmldumps.values().contains(canonicalLibraryPath))
return;
// TODO shouldn't be static - instead, if project changes, qmldump should probably change too.
static QString qmldumpPath;
if (qmldumpPath.isNull()) {
ProjectExplorer::Project *activeProject = ProjectExplorer::ProjectExplorerPlugin::instance()->startupProject();
if (!activeProject)
return;
ProjectExplorer::Project *activeProject = ProjectExplorer::ProjectExplorerPlugin::instance()->startupProject();
qmldumpPath = Qt4ProjectManager::QmlDumpTool::qmlDumpToolForProject(activeProject);
// ### no support for .qmlproject projects or cmake projects.
ProjectInfo info = projectInfo(activeProject);
QFileInfo qmldumpFileInfo(qmldumpPath);
if (!qmldumpFileInfo.exists()) {
qWarning() << "ModelManager::loadQmlPluginTypes: qmldump executable does not exist at" << qmldumpPath;
qmldumpPath.clear();
} else if (!qmldumpFileInfo.isFile()) {
qWarning() << "ModelManager::loadQmlPluginTypes: " << qmldumpPath << " is not a file";
qmldumpPath.clear();
}
}
if (qmldumpPath.isEmpty())
if (info.qmlDumpPath.isEmpty())
return;
QProcess *process = new QProcess(this);
@@ -501,7 +488,7 @@ void ModelManager::onLoadPluginTypes(const QString &libraryPath, const QString &
QStringList args;
args << importPath;
args << importUri;
process->start(qmldumpPath, args);
process->start(info.qmlDumpPath, args);
m_runningQmldumps.insert(process, canonicalLibraryPath);
}