diff options
| author | Fawzi Mohamed <fawzi.mohamed@digia.com> | 2013-02-20 14:35:55 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@digia.com> | 2013-02-20 16:38:26 +0100 |
| commit | 5e58349a2dfc3bf06ff38fe419933a50b9d9fff4 (patch) | |
| tree | 6513c6e590a896a1839c6b5f535b8c039f7de7f3 /src/plugins/qmljstools | |
| parent | cd96632965e26f03a2a0a61d98598f1c98d57d72 (diff) | |
| download | qt-creator-5e58349a2dfc3bf06ff38fe419933a50b9d9fff4.tar.gz | |
qmljs: look for builtins also in QTDIR/imports/QtQuick1
Change-Id: I661ad330b28bb88a378785afa2c2aee92da67918
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'src/plugins/qmljstools')
| -rw-r--r-- | src/plugins/qmljstools/qmljsplugindumper.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/qmljstools/qmljsplugindumper.cpp b/src/plugins/qmljstools/qmljsplugindumper.cpp index 41e29f19fd..766024d981 100644 --- a/src/plugins/qmljstools/qmljsplugindumper.cpp +++ b/src/plugins/qmljstools/qmljsplugindumper.cpp @@ -119,6 +119,13 @@ void PluginDumper::onLoadBuiltinTypes(const QmlJS::ModelManagerInterface::Projec loadQmltypesFile(QStringList(builtinQmltypesPath), info.qtImportsPath, builtinInfo); return; } + // QTDIR/imports/QtQuick1/builtins.qmltypes was used in developer builds of 5.0.0, 5.0.1 + const QString builtinQmltypesPath2 = info.qtImportsPath + + QLatin1String("/QtQuick1/builtins.qmltypes"); + if (QFile::exists(builtinQmltypesPath2)) { + loadQmltypesFile(QStringList(builtinQmltypesPath2), info.qtImportsPath, builtinInfo); + return; + } // run qmldump QProcess *process = new QProcess(this); |