summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLucie GΓ©rard <lucie.gerard@qt.io>2024-10-17 14:15:37 +0200
committerLucie GΓ©rard <lucie.gerard@qt.io>2024-10-17 16:00:15 +0200
commitfa95af07994f41bf8d78fa7c99f7719fcf993f17 (patch)
tree1c175c46c69c5c48a454c84a2c6dd9ec1426e81f
parentec9ed6afb305a9f5690133b760b6e24c033e428b (diff)
Clean up license and copyright
Pick-to: 6.8 Change-Id: Id2d7a03c979f8506791ed673c498d21b0485a96f Reviewed-by: Christian StrΓΈmme <christian.stromme@qt.io>
-rw-r--r--tests/auto/qml/qquickwebview/testwindow.h20
-rw-r--r--tests/auto/qml/qquickwebview/tst_qquickwebview.cpp20
-rw-r--r--tests/auto/qml/qquickwebview/util.h20
3 files changed, 6 insertions, 54 deletions
diff --git a/tests/auto/qml/qquickwebview/testwindow.h b/tests/auto/qml/qquickwebview/testwindow.h
index d74786c..2e14984 100644
--- a/tests/auto/qml/qquickwebview/testwindow.h
+++ b/tests/auto/qml/qquickwebview/testwindow.h
@@ -1,21 +1,5 @@
-/*
- Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#ifndef TESTWINDOW_H
#define TESTWINDOW_H
diff --git a/tests/auto/qml/qquickwebview/tst_qquickwebview.cpp b/tests/auto/qml/qquickwebview/tst_qquickwebview.cpp
index 8352144..412d9fd 100644
--- a/tests/auto/qml/qquickwebview/tst_qquickwebview.cpp
+++ b/tests/auto/qml/qquickwebview/tst_qquickwebview.cpp
@@ -1,21 +1,5 @@
-/*
- Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#include "testwindow.h"
#include "util.h"
diff --git a/tests/auto/qml/qquickwebview/util.h b/tests/auto/qml/qquickwebview/util.h
index 5199d4f..7817078 100644
--- a/tests/auto/qml/qquickwebview/util.h
+++ b/tests/auto/qml/qquickwebview/util.h
@@ -1,21 +1,5 @@
-/*
- Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#ifndef UTIL_H
#define UTIL_H