qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

QtQml: Respect import namespaces when importing scripts 

Pick-to: 6.5 6.6
Fixes: QTBUG-113991
Change-Id: I47651f303bcb53dc214d5f6bc70f65bac32f1b09
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
This commit is contained in:
Ulf Hermann 2023-07-06 10:00:11 +02:00
parent 8b1ee76623
commit 1c2ef41a88
6 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/qml/qml/qqmltypedata.cpp
View File

@ -1053,12 +1053,14 @@ bool QQmlTypeData::resolveType(const QString &typeName, QTypeRevision &version,
return true;
}
void QQmlTypeData::scriptImported(const QQmlRefPointer<QQmlScriptBlob> &blob, const QV4::CompiledData::Location &location, const QString &qualifier, const QString &/*nameSpace*/)
void QQmlTypeData::scriptImported(
const QQmlRefPointer<QQmlScriptBlob> &blob, const QV4::CompiledData::Location &location,
const QString &nameSpace, const QString &qualifier)
{
ScriptReference ref;
ref.script = blob;
ref.location = location;
ref.qualifier = qualifier;
ref.qualifier = qualifier.isEmpty() ? nameSpace : qualifier + QLatin1Char('.') + nameSpace;
m_scripts << ref;
}

4
src/qml/qml/qqmltypedata_p.h
View File

@ -103,7 +103,9 @@ private:
QQmlType::RegistrationType registrationType = QQmlType::AnyRegistrationType,
bool *typeRecursionDetected = nullptr);
void scriptImported(const QQmlRefPointer<QQmlScriptBlob> &blob, const QV4::CompiledData::Location &location, const QString &qualifier, const QString &nameSpace) override;
void scriptImported(
const QQmlRefPointer<QQmlScriptBlob> &blob, const QV4::CompiledData::Location &location,
const QString &nameSpace, const QString &qualifier) override;
SourceCodeData m_backupSourceCode; // used when cache verification fails.
QScopedPointer<QmlIR::Document> m_document;

4
tests/auto/qml/qqmlimport/data/MyModuleName/Font.js Normal file
View File

@ -0,0 +1,4 @@
.pragma library
.import QtQuick as QtQuick
var exampleVar = 12;

2
tests/auto/qml/qqmlimport/data/MyModuleName/qmldir Normal file
View File

@ -0,0 +1,2 @@
module MyModuleName
Font 0.1 Font.js

8
tests/auto/qml/qqmlimport/data/qualifiedScriptImport.qml Normal file
View File

@ -0,0 +1,8 @@
import QtQuick
import 'MyModuleName' as MyModuleName
Item {
property var a: MyModuleName.Font.exampleVar
property var b: Font.SmallCaps
property var c: Font.exampleVar
}

14
tests/auto/qml/qqmlimport/tst_qqmlimport.cpp
View File

@ -38,6 +38,7 @@ private slots:
void invalidFileImport_data();
void invalidFileImport();
void implicitWithDependencies();
void qualifiedScriptImport();
};
void tst_QQmlImport::cleanup()
@ -123,6 +124,19 @@ void tst_QQmlImport::implicitWithDependencies()
QCOMPARE(o->objectName(), QStringLiteral("notARectangle"));
}
void tst_QQmlImport::qualifiedScriptImport()
{
QQmlEngine engine;
QQmlComponent component(&engine, testFileUrl("qualifiedScriptImport.qml"));
QVERIFY2(component.isReady(), qPrintable(component.errorString()));
QScopedPointer<QObject> o(component.create());
QVERIFY(!o.isNull());
QCOMPARE(o->property("a"), QVariant::fromValue<double>(12));
QCOMPARE(o->property("b"), QVariant::fromValue<int>(3));
QCOMPARE(o->property("c"), QVariant());
}
void tst_QQmlImport::testDesignerSupported()
{
QQuickView *window = new QQuickView();