6 files changed, 16 insertions, 13 deletions
diff --git a/tests/manual/lance/CMakeLists.txt b/tests/manual/lance/CMakeLists.txt
index 3b932c3629..41eb18b6c2 100644
--- a/tests/manual/lance/CMakeLists.txt
+++ b/tests/manual/lance/CMakeLists.txt
@@ -1,4 +1,5 @@
-# Generated from lance.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
 ## lance Binary:
@@ -10,10 +11,12 @@ qt_internal_add_manual_test(lance
         interactivewidget.cpp interactivewidget.h
         main.cpp
         widgets.h
+    NO_PCH_SOURCES
+        interactivewidget.cpp # undef QT_NO_FOREACH
     INCLUDE_DIRECTORIES
         .
         ../../baseline/shared
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::CorePrivate
         Qt::Gui
         Qt::GuiPrivate
@@ -74,14 +77,10 @@ qt_internal_add_resource(lance "images"
         ${images_resource_files}
 )
 
-
-#### Keys ignored in scope 1:.:.:lance.pro:<TRUE>:
-# TEMPLATE = "app"
-
 ## Scopes:
 #####################################################################
 
 qt_internal_extend_target(lance CONDITION TARGET Qt::OpenGL
-    PUBLIC_LIBRARIES
+    LIBRARIES
         Qt::OpenGL
 )
diff --git a/tests/manual/lance/README b/tests/manual/lance/README
index 6e89b29b08..68a9d647bc 100644
--- a/tests/manual/lance/README
+++ b/tests/manual/lance/README
@@ -1,6 +1,6 @@
 The "lance" tool can be used to edit and run QPainter script (.qps)
 files. They are used in the "lancelot" qpainter regression autotest.
-A collection of scripts can be found in the directory
-tests/auto/lancelot/scripts
+A collection of scripts can be found in subdirectories under
+tests/baseline
 
 See lance -help for options.
diff --git a/tests/manual/lance/interactivewidget.cpp b/tests/manual/lance/interactivewidget.cpp
index cd2084978c..03bfca8566 100644
--- a/tests/manual/lance/interactivewidget.cpp
+++ b/tests/manual/lance/interactivewidget.cpp
@@ -1,5 +1,8 @@
 // Copyright (C) 2016 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
+
+#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses
+
 #include "interactivewidget.h"
 #include <QtWidgets>
 
diff --git a/tests/manual/lance/interactivewidget.h b/tests/manual/lance/interactivewidget.h
index c5f66dc0a6..b11c6cfee2 100644
--- a/tests/manual/lance/interactivewidget.h
+++ b/tests/manual/lance/interactivewidget.h
@@ -1,5 +1,5 @@
 // Copyright (C) 2016 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 INTERACTIVEWIDGET_H
 #define INTERACTIVEWIDGET_H
 
diff --git a/tests/manual/lance/main.cpp b/tests/manual/lance/main.cpp
index 53f094c5c6..f39001f3c2 100644
--- a/tests/manual/lance/main.cpp
+++ b/tests/manual/lance/main.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2016 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 "interactivewidget.h"
 #include "widgets.h"
 #include "paintcommands.h"
@@ -191,6 +191,7 @@ int main(int argc, char **argv)
 
     DeviceType type = WidgetType;
     QSurfaceFormat contextFormat;
+    contextFormat.setStencilBufferSize(8);
     bool checkers_background = true;
 
     QImage::Format imageFormat = QImage::Format_ARGB32_Premultiplied;
diff --git a/tests/manual/lance/widgets.h b/tests/manual/lance/widgets.h
index fb8429648e..ae2e75fbdc 100644
--- a/tests/manual/lance/widgets.h
+++ b/tests/manual/lance/widgets.h
@@ -1,5 +1,5 @@
 // Copyright (C) 2016 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 WIDGETS_H
 #define WIDGETS_H