summaryrefslogtreecommitdiffstats
path: root/src/tools/windeployqt
diff options
context:
space:
mode:
authorTarja Sundqvist <[email protected]>2025-07-02 10:15:21 +0300
committerTarja Sundqvist <[email protected]>2025-07-02 10:15:21 +0300
commitffe3f3565e8b9a5c7e0ea6b33dc7993d3902077e (patch)
treea972df58b2ffee7a6be9e14aa58123c94226cfd2 /src/tools/windeployqt
parent3fe9e69e4d7510480544f928e8a07f0f110b2181 (diff)
parentc8c0c677693c047a9dbf94c2a88eb920ed11acc8 (diff)
Merge tag 'v6.5.5-lts-lgpl' into 6.5.56.5.5
Qt 6.5.5-lts-lgpl
Diffstat (limited to 'src/tools/windeployqt')
-rw-r--r--src/tools/windeployqt/elfreader.cpp2
-rw-r--r--src/tools/windeployqt/elfreader.h2
-rw-r--r--src/tools/windeployqt/main.cpp2
-rw-r--r--src/tools/windeployqt/qmlutils.cpp2
-rw-r--r--src/tools/windeployqt/qmlutils.h2
-rw-r--r--src/tools/windeployqt/qtmoduleinfo.cpp2
-rw-r--r--src/tools/windeployqt/qtmoduleinfo.h2
-rw-r--r--src/tools/windeployqt/utils.cpp2
-rw-r--r--src/tools/windeployqt/utils.h2
9 files changed, 9 insertions, 9 deletions
diff --git a/src/tools/windeployqt/elfreader.cpp b/src/tools/windeployqt/elfreader.cpp
index 8897fe58747..9ef3b6bfa41 100644
--- a/src/tools/windeployqt/elfreader.cpp
+++ b/src/tools/windeployqt/elfreader.cpp
@@ -1,5 +1,5 @@
// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include "elfreader.h"
diff --git a/src/tools/windeployqt/elfreader.h b/src/tools/windeployqt/elfreader.h
index daa68f0d49f..bea53c2ee47 100644
--- a/src/tools/windeployqt/elfreader.h
+++ b/src/tools/windeployqt/elfreader.h
@@ -1,5 +1,5 @@
// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#ifndef ELFREADER_H
#define ELFREADER_H
diff --git a/src/tools/windeployqt/main.cpp b/src/tools/windeployqt/main.cpp
index 6f5a6cd800b..4ba149a1e23 100644
--- a/src/tools/windeployqt/main.cpp
+++ b/src/tools/windeployqt/main.cpp
@@ -1,5 +1,5 @@
// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include "utils.h"
#include "qmlutils.h"
diff --git a/src/tools/windeployqt/qmlutils.cpp b/src/tools/windeployqt/qmlutils.cpp
index 79c9ea7d750..5104af01949 100644
--- a/src/tools/windeployqt/qmlutils.cpp
+++ b/src/tools/windeployqt/qmlutils.cpp
@@ -1,5 +1,5 @@
// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include "qmlutils.h"
#include "utils.h"
diff --git a/src/tools/windeployqt/qmlutils.h b/src/tools/windeployqt/qmlutils.h
index 31f11b14bde..bff1fb3a9bf 100644
--- a/src/tools/windeployqt/qmlutils.h
+++ b/src/tools/windeployqt/qmlutils.h
@@ -1,5 +1,5 @@
// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#ifndef QMLUTILS_H
#define QMLUTILS_H
diff --git a/src/tools/windeployqt/qtmoduleinfo.cpp b/src/tools/windeployqt/qtmoduleinfo.cpp
index e02adc65e08..ebef4f1de4e 100644
--- a/src/tools/windeployqt/qtmoduleinfo.cpp
+++ b/src/tools/windeployqt/qtmoduleinfo.cpp
@@ -1,5 +1,5 @@
// Copyright (C) 2023 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include "qtmoduleinfo.h"
#include "utils.h"
diff --git a/src/tools/windeployqt/qtmoduleinfo.h b/src/tools/windeployqt/qtmoduleinfo.h
index 094f79904f4..b35403a090b 100644
--- a/src/tools/windeployqt/qtmoduleinfo.h
+++ b/src/tools/windeployqt/qtmoduleinfo.h
@@ -1,5 +1,5 @@
// Copyright (C) 2023 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#ifndef QTMODULEINFO_H
#define QTMODULEINFO_H
diff --git a/src/tools/windeployqt/utils.cpp b/src/tools/windeployqt/utils.cpp
index 7f01953e39d..d37b87b63de 100644
--- a/src/tools/windeployqt/utils.cpp
+++ b/src/tools/windeployqt/utils.cpp
@@ -1,5 +1,5 @@
// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include "utils.h"
#include "elfreader.h"
diff --git a/src/tools/windeployqt/utils.h b/src/tools/windeployqt/utils.h
index 704ed7e812d..5bf2cde1111 100644
--- a/src/tools/windeployqt/utils.h
+++ b/src/tools/windeployqt/utils.h
@@ -1,5 +1,5 @@
// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#ifndef UTILS_H
#define UTILS_H