summaryrefslogtreecommitdiff
path: root/src/plugins/qmljseditor
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/qmljseditor')
-rw-r--r--src/plugins/qmljseditor/qmljsmodelmanager.cpp27
1 files changed, 7 insertions, 20 deletions
diff --git a/src/plugins/qmljseditor/qmljsmodelmanager.cpp b/src/plugins/qmljseditor/qmljsmodelmanager.cpp
index 2f3d14387b..f30357ff64 100644
--- a/src/plugins/qmljseditor/qmljsmodelmanager.cpp
+++ b/src/plugins/qmljseditor/qmljsmodelmanager.cpp
@@ -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();
- qmldumpPath = Qt4ProjectManager::QmlDumpTool::qmlDumpToolForProject(activeProject);
- // ### no support for .qmlproject projects or cmake projects.
-
- 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();
- }
+ ProjectExplorer::Project *activeProject = ProjectExplorer::ProjectExplorerPlugin::instance()->startupProject();
+ if (!activeProject)
+ return;
- }
- if (qmldumpPath.isEmpty())
+ ProjectInfo info = projectInfo(activeProject);
+
+ 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);
}