forked from qt-creator/qt-creator
qmljs: Do not use app.qmltypes and lib.qmltypes anymore
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:
@@ -35,6 +35,7 @@
|
||||
#include <utils/qrcparser.h>
|
||||
|
||||
#include <QDir>
|
||||
#include <QDirIterator>
|
||||
|
||||
using namespace LanguageUtils;
|
||||
using namespace QmlJS::AST;
|
||||
@@ -385,8 +386,10 @@ Import LinkPrivate::importNonFile(const Document::Ptr &doc, const ImportInfo &im
|
||||
|
||||
if (!importFound) {
|
||||
for (const QString &dir : qAsConst(m_applicationDirectories)) {
|
||||
QDirIterator it(dir, QStringList { "*.qmltypes" }, QDir::Files);
|
||||
|
||||
// This adds the types to the C++ types, to be found below if applicable.
|
||||
if (QFile::exists(dir + "/app.qmltypes"))
|
||||
if (it.hasNext())
|
||||
importLibrary(doc, dir, &import);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user