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

qmljs: Do not use app.qmltypes and lib.qmltypes anymore

Browse Source 
Task-number: QTBUG-82710
Change-Id: I876ec2b8e2b668a239248511b0fbd58389098de6
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Maximilian Goldstein
2020-03-26 12:17:03 +01:00
parent b9fb5b65f6
commit 2392f29a59
3 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/libs/qmljs/qmljsplugindumper.cpp
View File

@@ -36,17 +36,12 @@
#include <utils/hostosinfo.h>
#include <QDir>
#include <QDirIterator>
#include <QRegularExpression>
using namespace LanguageUtils;
using namespace QmlJS;
static const QStringList qmltypesFileNames = {
QLatin1String("plugins.qmltypes"),
QLatin1String("app.qmltypes"),
QLatin1String("lib.qmltypes")
};
PluginDumper::PluginDumper(ModelManagerInterface *modelManager)
: QObject(modelManager)
, m_modelManager(modelManager)
@@ -152,9 +147,12 @@ void PluginDumper::onLoadPluginTypes(const QString &libraryPath, const QString &
plugin.importVersion = importVersion;
// add default qmltypes file if it exists
for (const QString &qmltypesFileName : qmltypesFileNames) {
const QString defaultQmltypesPath = makeAbsolute(qmltypesFileName, canonicalLibraryPath);
if (!plugin.typeInfoPaths.contains(defaultQmltypesPath) && QFile::exists(defaultQmltypesPath))
QDirIterator it(canonicalLibraryPath, QStringList { "*.qmltypes" }, QDir::Files);
while (it.hasNext()) {
const QString defaultQmltypesPath = makeAbsolute(it.next(), canonicalLibraryPath);
if (!plugin.typeInfoPaths.contains(defaultQmltypesPath))
plugin.typeInfoPaths += defaultQmltypesPath;
}
@@ -405,11 +403,10 @@ QString PluginDumper::buildQmltypesPath(const QString &name) const
if (path.isEmpty())
return QString();
for (const QString &qmltypesFileName : qmltypesFileNames) {
const QString filename = path + QLatin1Char('/') + qmltypesFileName;
if (QFile::exists(filename))
return filename;
}
QDirIterator it(path, QStringList { "*.qmltypes" }, QDir::Files);
if (it.hasNext())
return it.next();
return QString();
}