2 files changed, 9 insertions, 36 deletions
diff --git a/tests/manual/foreignwindows/CMakeLists.txt b/tests/manual/foreignwindows/CMakeLists.txt
index 96df481ba4..41b2260946 100644
--- a/tests/manual/foreignwindows/CMakeLists.txt
+++ b/tests/manual/foreignwindows/CMakeLists.txt
@@ -1,4 +1,5 @@
-# Generated from foreignwindows.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
 ## foreignwindows Binary:
@@ -15,7 +16,7 @@ qt_internal_add_manual_test(foreignwindows
         QT_DIAG_LIB
     INCLUDE_DIRECTORIES
         ../diaglib
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::CorePrivate
         Qt::Gui
         Qt::GuiPrivate
@@ -23,16 +24,13 @@ qt_internal_add_manual_test(foreignwindows
         Qt::Widgets
 )
 
-#### Keys ignored in scope 1:.:.:foreignwindows.pro:<TRUE>:
-# TEMPLATE = "app"
-
 ## Scopes:
 #####################################################################
 
 qt_internal_extend_target(foreignwindows CONDITION WIN32
     SOURCES
         ../diaglib/nativewindowdump_win.cpp
-    PUBLIC_LIBRARIES
+    LIBRARIES
         user32
 )
 
@@ -46,14 +44,14 @@ qt_internal_extend_target(foreignwindows CONDITION QT_FEATURE_widgets
         ../diaglib/debugproxystyle.cpp ../diaglib/debugproxystyle.h
         ../diaglib/logwidget.cpp ../diaglib/logwidget.h
         ../diaglib/qwidgetdump.cpp ../diaglib/qwidgetdump.h
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::WidgetsPrivate
 )
 
 qt_internal_extend_target(foreignwindows CONDITION QT_FEATURE_opengl
     SOURCES
         ../diaglib/glinfo.cpp ../diaglib/glinfo.h
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::OpenGL
         Qt::OpenGLWidgets
 )
diff --git a/tests/manual/foreignwindows/main.cpp b/tests/manual/foreignwindows/main.cpp
index 700ecf379b..1fb4b0c167 100644
--- a/tests/manual/foreignwindows/main.cpp
+++ b/tests/manual/foreignwindows/main.cpp
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2017 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include <QtGui/QAction>
 #include <QtWidgets/QApplication>
@@ -302,7 +277,7 @@ int main(int argc, char *argv[])
         QPoint pos = availableGeometry.topLeft() + QPoint(availableGeometry.width(), availableGeometry.height()) / 3;
 
         WidgetPtrList mainWindows;
-        for (QWindow *window : qAsConst(windows)) {
+        for (QWindow *window : std::as_const(windows)) {
             WidgetPtr mainWindow(new EmbeddingWindow(window));
             mainWindow->move(pos);
             mainWindow->resize(availableGeometry.size() / 4);