summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--dependencies.yaml6
-rw-r--r--src/interfaceframework/queryparser/qifqueryparser.cpp1
-rw-r--r--src/interfaceframework/queryparser/qifqueryparser.g1
-rw-r--r--src/interfaceframework/queryparser/qifqueryparsertable.cpp2
-rw-r--r--src/interfaceframework/queryparser/qifqueryparsertable_p.h2
-rw-r--r--src/tools/ifcodegen/generator/filters.py4
6 files changed, 9 insertions, 7 deletions
diff --git a/dependencies.yaml b/dependencies.yaml
index 0e1a7dea..e1471b48 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -1,10 +1,10 @@
dependencies:
../qtdeclarative:
- ref: df707e25bf7adda63746a4ca00c08c41e14cfe20
+ ref: 8bd1fd8c891319dc715ee93a9d7575654130c0f9
required: true
../qtremoteobjects:
- ref: b6dd75416920ffca4215adcfc4bbd3299a7250eb
+ ref: 27e1aa57ad4d16747f19d439c674894615149006
required: true
../qttools:
- ref: 1e4ffb798102a56a73d84bc8ae09243aa8de348e
+ ref: d544624a5968d8561e092590657c72002650de79
required: false
diff --git a/src/interfaceframework/queryparser/qifqueryparser.cpp b/src/interfaceframework/queryparser/qifqueryparser.cpp
index a5758971..910a4160 100644
--- a/src/interfaceframework/queryparser/qifqueryparser.cpp
+++ b/src/interfaceframework/queryparser/qifqueryparser.cpp
@@ -399,6 +399,7 @@ QIfAbstractQueryTerm *QIfQueryParser::parse()
++shifts;
}
}
+ Q_UNUSED(reduces);
QString errorMessage = QString(QLatin1String("Got %1 but expected on of the following types:\n")).arg(QLatin1String(spell[yytoken]));
for (int token : expectedTokens)
diff --git a/src/interfaceframework/queryparser/qifqueryparser.g b/src/interfaceframework/queryparser/qifqueryparser.g
index dcc527cd..dae28f63 100644
--- a/src/interfaceframework/queryparser/qifqueryparser.g
+++ b/src/interfaceframework/queryparser/qifqueryparser.g
@@ -631,6 +631,7 @@ multi_operator ::= NE_OP ;
++shifts;
}
}
+ Q_UNUSED(reduces);
QString errorMessage = QString(QLatin1String("Got %1 but expected on of the following types:\n")).arg(QLatin1String(spell[yytoken]));
for (int token : expectedTokens)
diff --git a/src/interfaceframework/queryparser/qifqueryparsertable.cpp b/src/interfaceframework/queryparser/qifqueryparsertable.cpp
index 01c6838d..2c2afad9 100644
--- a/src/interfaceframework/queryparser/qifqueryparsertable.cpp
+++ b/src/interfaceframework/queryparser/qifqueryparsertable.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2023 The Qt Company Ltd and other contributors.
+// Copyright (C) 2023 The Qt Company Ltd. and other contributors.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
// This file was generated by qlalr - DO NOT EDIT!
diff --git a/src/interfaceframework/queryparser/qifqueryparsertable_p.h b/src/interfaceframework/queryparser/qifqueryparsertable_p.h
index dc3c5f48..e417b5f7 100644
--- a/src/interfaceframework/queryparser/qifqueryparsertable_p.h
+++ b/src/interfaceframework/queryparser/qifqueryparsertable_p.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2023 The Qt Company Ltd and other contributors.
+// Copyright (C) 2023 The Qt Company Ltd. and other contributors.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
//
diff --git a/src/tools/ifcodegen/generator/filters.py b/src/tools/ifcodegen/generator/filters.py
index 40e966c3..ea89a1bb 100644
--- a/src/tools/ifcodegen/generator/filters.py
+++ b/src/tools/ifcodegen/generator/filters.py
@@ -105,8 +105,8 @@ def test_type_value(symbol):
elif symbol.type.is_list:
value = test_type_value(t.nested.type)
if not (t.nested.type.is_primitive):
- value = 'QVariant::fromValue({0})'.format(value)
- return 'QVariantList({{{0}}})'.format(value)
+ return 'QVariantList({{QVariant::fromValue({0})}})'.format(value)
+ return 'QVariantList({0})'.format(value)
elif symbol.type.is_struct:
prefix = namespace_prefix(symbol.type.reference.module)
values_string = ', '.join(test_type_value(e) for e in symbol.type.reference.fields)