aboutsummaryrefslogtreecommitdiffstats
path: root/tools/qml
diff options
context:
space:
mode:
authorTarja Sundqvist <[email protected]>2025-06-03 13:43:35 +0300
committerTarja Sundqvist <[email protected]>2025-06-03 13:43:35 +0300
commit0f0972d542d9869c2dcfaf9c963d42ff32766460 (patch)
treef283360ffbf0453e04a321e01f0c3df1c07df3e3 /tools/qml
parent07e23b0f4983631524716f034c0268fd11d037f9 (diff)
parentff0a47c8f267e905113b82c53af2742027f0eca6 (diff)
Merge tag 'v6.5.6-lts-lgpl' into 6.56.5
Qt 6.5.6-lts-lgpl release
Diffstat (limited to 'tools/qml')
-rw-r--r--tools/qml/conf/content/resizeItemToWindow.qml2
-rw-r--r--tools/qml/conf/content/resizeWindowToItem.qml2
-rw-r--r--tools/qml/conf/default.qml2
-rw-r--r--tools/qml/conf/resizeToItem.qml2
4 files changed, 4 insertions, 4 deletions
diff --git a/tools/qml/conf/content/resizeItemToWindow.qml b/tools/qml/conf/content/resizeItemToWindow.qml
index 4810b6f0e4..4a6d06591c 100644
--- a/tools/qml/conf/content/resizeItemToWindow.qml
+++ b/tools/qml/conf/content/resizeItemToWindow.qml
@@ -1,5 +1,5 @@
// Copyright (C) 2019 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
import QtQuick.Window 2.0
import QtQuick 2.0
diff --git a/tools/qml/conf/content/resizeWindowToItem.qml b/tools/qml/conf/content/resizeWindowToItem.qml
index 586047459c..942e739d13 100644
--- a/tools/qml/conf/content/resizeWindowToItem.qml
+++ b/tools/qml/conf/content/resizeWindowToItem.qml
@@ -1,5 +1,5 @@
// Copyright (C) 2019 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
import QtQuick.Window 2.0
import QtQuick 2.0
diff --git a/tools/qml/conf/default.qml b/tools/qml/conf/default.qml
index b4fa025e66..c9bae6dcd0 100644
--- a/tools/qml/conf/default.qml
+++ b/tools/qml/conf/default.qml
@@ -1,5 +1,5 @@
// Copyright (C) 2019 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
import QmlRuntime.Config 1.0
Configuration {
diff --git a/tools/qml/conf/resizeToItem.qml b/tools/qml/conf/resizeToItem.qml
index fe40e9f2d3..7c1389a7a7 100644
--- a/tools/qml/conf/resizeToItem.qml
+++ b/tools/qml/conf/resizeToItem.qml
@@ -1,5 +1,5 @@
// Copyright (C) 2019 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
import QmlRuntime.Config 1.0
Configuration {