11 files changed, 11 insertions, 27 deletions
diff --git a/tests/manual/xembed/CMakeLists.txt b/tests/manual/xembed/CMakeLists.txt
index 9137e1b940..f486f202a5 100644
--- a/tests/manual/xembed/CMakeLists.txt
+++ b/tests/manual/xembed/CMakeLists.txt
@@ -1,4 +1,3 @@
-# Generated from xembed.pro.
 
 if(QT_FEATURE_gtk3)
     add_subdirectory(gtk-container)
diff --git a/tests/manual/xembed/gtk-container/CMakeLists.txt b/tests/manual/xembed/gtk-container/CMakeLists.txt
index 87694d0fb5..c109bbc95b 100644
--- a/tests/manual/xembed/gtk-container/CMakeLists.txt
+++ b/tests/manual/xembed/gtk-container/CMakeLists.txt
@@ -1,7 +1,6 @@
-# Generated from gtk-container.pro.
 
-qt_find_package(GTK3) # special case
-qt_find_package(X11) # special case
+qt_find_package(GTK3)
+qt_find_package(X11)
 
 #####################################################################
 ## gtk-container Binary:
@@ -13,15 +12,11 @@ qt_internal_add_manual_test(gtk-container
         gtk-container.cpp
         DEFINES
         GDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6
-    LIBRARIES # special case
+    LIBRARIES
         PkgConfig::GTK3
         Qt::Core
         Qt::CorePrivate
         Qt::Gui
         Qt::GuiPrivate
-        X11::X11 # special case
+        X11::X11
 )
-
-#### Keys ignored in scope 1:.:.:qt-client-widget.pro:<TRUE>:
-# TEMPLATE = "app"
-
diff --git a/tests/manual/xembed/gtk-container/gtk-container.cpp b/tests/manual/xembed/gtk-container/gtk-container.cpp
index 41d88e8d51..2ecbe10545 100644
--- a/tests/manual/xembed/gtk-container/gtk-container.cpp
+++ b/tests/manual/xembed/gtk-container/gtk-container.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2022 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include <gtk/gtk.h>
 #include <gtk/gtkx.h>
diff --git a/tests/manual/xembed/qt-client-raster/CMakeLists.txt b/tests/manual/xembed/qt-client-raster/CMakeLists.txt
index 3a7f8c9ff5..0784f411a3 100644
--- a/tests/manual/xembed/qt-client-raster/CMakeLists.txt
+++ b/tests/manual/xembed/qt-client-raster/CMakeLists.txt
@@ -1,8 +1,6 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from qt-client-raster.pro.
-
 #####################################################################
 ## qt-client-raster Binary:
 #####################################################################
@@ -15,6 +13,3 @@ qt_internal_add_manual_test(qt-client-raster
     LIBRARIES
         Qt::Gui
 )
-
-#### Keys ignored in scope 1:.:.:qt-client-raster.pro:<TRUE>:
-# TEMPLATE = "app"
diff --git a/tests/manual/xembed/qt-client-raster/main.cpp b/tests/manual/xembed/qt-client-raster/main.cpp
index f522e1401f..628a9f652c 100644
--- a/tests/manual/xembed/qt-client-raster/main.cpp
+++ b/tests/manual/xembed/qt-client-raster/main.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2017 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include "rasterwindow.h"
 #include <QDebug>
diff --git a/tests/manual/xembed/qt-client-raster/rasterwindow.cpp b/tests/manual/xembed/qt-client-raster/rasterwindow.cpp
index b99ca4b254..89d765f707 100644
--- a/tests/manual/xembed/qt-client-raster/rasterwindow.cpp
+++ b/tests/manual/xembed/qt-client-raster/rasterwindow.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2017 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include "rasterwindow.h"
 
diff --git a/tests/manual/xembed/qt-client-raster/rasterwindow.h b/tests/manual/xembed/qt-client-raster/rasterwindow.h
index 251237dc0b..2d41cd8e5d 100644
--- a/tests/manual/xembed/qt-client-raster/rasterwindow.h
+++ b/tests/manual/xembed/qt-client-raster/rasterwindow.h
@@ -1,5 +1,5 @@
 // Copyright (C) 2017 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #ifndef RASTERWINDOW_H
 #define RASTERWINDOW_H
diff --git a/tests/manual/xembed/qt-client-widget/CMakeLists.txt b/tests/manual/xembed/qt-client-widget/CMakeLists.txt
index c4135b7758..8c9ea9e0f8 100644
--- a/tests/manual/xembed/qt-client-widget/CMakeLists.txt
+++ b/tests/manual/xembed/qt-client-widget/CMakeLists.txt
@@ -1,8 +1,6 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from qt-client-widget.pro.
-
 #####################################################################
 ## qt-client-widget Binary:
 #####################################################################
@@ -16,6 +14,3 @@ qt_internal_add_manual_test(qt-client-widget
         Qt::Gui
         Qt::Widgets
 )
-
-#### Keys ignored in scope 1:.:.:qt-client-widget.pro:<TRUE>:
-# TEMPLATE = "app"
diff --git a/tests/manual/xembed/qt-client-widget/main.cpp b/tests/manual/xembed/qt-client-widget/main.cpp
index 7451d7bb1e..bd8b05b054 100644
--- a/tests/manual/xembed/qt-client-widget/main.cpp
+++ b/tests/manual/xembed/qt-client-widget/main.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2017 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include <QApplication>
 #include <QDebug>
diff --git a/tests/manual/xembed/qt-client-widget/window.cpp b/tests/manual/xembed/qt-client-widget/window.cpp
index 756e956bb6..92feca7506 100644
--- a/tests/manual/xembed/qt-client-widget/window.cpp
+++ b/tests/manual/xembed/qt-client-widget/window.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2017 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include <QtWidgets>
 
diff --git a/tests/manual/xembed/qt-client-widget/window.h b/tests/manual/xembed/qt-client-widget/window.h
index b749c04009..2b069f1ff0 100644
--- a/tests/manual/xembed/qt-client-widget/window.h
+++ b/tests/manual/xembed/qt-client-widget/window.h
@@ -1,5 +1,5 @@
 // Copyright (C) 2017 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #ifndef WINDOW_H
 #define WINDOW_H