aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/compiler
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2020-11-26 11:26:55 +0100
committerUlf Hermann <ulf.hermann@qt.io>2020-11-26 20:01:51 +0100
commit81629021ebc8789974c2f3c142b46eef799c1a95 (patch)
tree923d5f3ca1776265ce0bae8466e4da8a2de9c0f5 /src/qml/compiler
parentf16f477eba8415f9edfd5d4b220ab8a565051410 (diff)
QML: Introduce "pragma Strict"
This doesn't carry any meaning, yet, but it can be used by any tools to apply stricter rules to a particular piece of QML. Change-Id: I0bf8f22001c19c7cc2989abedc747d3d5b1bdee1 Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io> Reviewed-by: Andrei Golubev <andrei.golubev@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/compiler')
-rw-r--r--src/qml/compiler/qqmlirbuilder.cpp11
-rw-r--r--src/qml/compiler/qqmlirbuilder_p.h3
2 files changed, 10 insertions, 4 deletions
diff --git a/src/qml/compiler/qqmlirbuilder.cpp b/src/qml/compiler/qqmlirbuilder.cpp
index fa25d41113..b6bc48c833 100644
--- a/src/qml/compiler/qqmlirbuilder.cpp
+++ b/src/qml/compiler/qqmlirbuilder.cpp
@@ -787,9 +787,10 @@ bool IRBuilder::visit(QQmlJS::AST::UiPragma *node)
// For now the only valid pragma is Singleton, so lets validate the input
if (!node->name.isNull())
{
- if (QLatin1String("Singleton") == node->name)
- {
+ if (node->name == QStringLiteral("Singleton")) {
pragma->type = Pragma::PragmaSingleton;
+ } else if (node->name == QStringLiteral("Strict")) {
+ pragma->type = Pragma::PragmaStrict;
} else {
recordError(node->pragmaToken, QCoreApplication::translate("QQmlParser","Pragma requires a valid qualifier"));
return false;
@@ -1603,9 +1604,13 @@ void QmlUnitGenerator::generate(Document &output, const QV4::CompiledData::Depen
// enable flag if we encountered pragma Singleton
for (Pragma *p : qAsConst(output.pragmas)) {
- if (p->type == Pragma::PragmaSingleton) {
+ switch (p->type) {
+ case Pragma::PragmaSingleton:
createdUnit->flags |= QV4::CompiledData::Unit::IsSingleton;
break;
+ case Pragma::PragmaStrict:
+ createdUnit->flags |= QV4::CompiledData::Unit::IsStrict;
+ break;
}
}
diff --git a/src/qml/compiler/qqmlirbuilder_p.h b/src/qml/compiler/qqmlirbuilder_p.h
index 058f9802ae..e755694335 100644
--- a/src/qml/compiler/qqmlirbuilder_p.h
+++ b/src/qml/compiler/qqmlirbuilder_p.h
@@ -410,7 +410,8 @@ private:
struct Q_QMLCOMPILER_PRIVATE_EXPORT Pragma
{
enum PragmaType {
- PragmaSingleton = 0x1
+ PragmaSingleton = 0x1,
+ PragmaStrict = 0x2
};
quint32 type;