diff options
| author | Tarja Sundqvist <[email protected]> | 2025-07-02 10:12:57 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <[email protected]> | 2025-07-02 10:12:57 +0300 |
| commit | 8d924fe2c6a81916d421947f2a22ae0844888258 (patch) | |
| tree | ae40a18ff71f97aa4623c3d62d8d7462ce64ee15 /tools | |
| parent | 07e23b0f4983631524716f034c0268fd11d037f9 (diff) | |
| parent | 1bdc78e942ff99f8cc8171a6d21237740a2ad9df (diff) | |
Merge tag 'v6.5.5-lts-lgpl' into 6.5.56.5.5
Qt 6.5.5-lts-lgpl release
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qml/conf/content/resizeItemToWindow.qml | 2 | ||||
| -rw-r--r-- | tools/qml/conf/content/resizeWindowToItem.qml | 2 | ||||
| -rw-r--r-- | tools/qml/conf/default.qml | 2 | ||||
| -rw-r--r-- | tools/qml/conf/resizeToItem.qml | 2 |
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 { |