1 files changed, 14 insertions, 12 deletions

diff --git a/tests/baseline/controls/tst_baseline_controls.cpp b/tests/baseline/controls/tst_baseline_controls.cpp
index 2b398edf3c..1467749d06 100644
--- a/tests/baseline/controls/tst_baseline_controls.cpp
+++ b/tests/baseline/controls/tst_baseline_controls.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 <qbaselinetest.h>
 
@@ -123,24 +123,24 @@ void tst_Baseline_Controls::initTestCase()
     // See also qwidgetbaselinetest.cpp
     QPalette palette;
     QFont font;
-    QByteArray appearanceBytes;
+    QByteArray colorSchemeBytes;
     {
-        QDataStream appearanceStream(&appearanceBytes, QIODevice::WriteOnly);
-        appearanceStream << palette << font;
+        QDataStream colorSchemeStream(&colorSchemeBytes, QIODevice::WriteOnly);
+        colorSchemeStream << palette << font;
         const qreal screenDpr = QGuiApplication::primaryScreen()->devicePixelRatio();
         if (screenDpr != 1.0) {
             qWarning() << "DPR is" << screenDpr << "- images will not be compared to 1.0 baseline!";
-            appearanceStream << screenDpr;
+            colorSchemeStream << screenDpr;
         }
     }
-    const quint16 appearanceId = qChecksum(appearanceBytes);
+    const quint16 colorSchemeId = qChecksum(colorSchemeBytes);
 
     const QColor windowColor = palette.window().color();
     const QColor textColor = palette.text().color();
-    const QString appearanceIdString = (windowColor.value() > textColor.value()
+    const QString colorSchemeIdStr = (windowColor.value() > textColor.value()
                                         ? QString("light-%1") : QString("dark-%1"))
-                                        .arg(appearanceId, 0, 16);
-    QBaselineTest::addClientProperty("AppearanceID", appearanceIdString);
+                                        .arg(colorSchemeId, 0, 16);
+    QBaselineTest::addClientProperty("AppearanceID", colorSchemeIdStr);
 
     QByteArray msg;
     if (!QBaselineTest::connectToBaselineServer(&msg))
@@ -148,7 +148,7 @@ void tst_Baseline_Controls::initTestCase()
 
     // let users know where they can find the results
     qInfo("PlatformName computed to be  : %s", qPrintable(platformName));
-    qInfo("Appearance ID computed as    : %s", qPrintable(appearanceIdString));
+    qInfo("Color Scheme computed as    : %s", qPrintable(colorSchemeIdStr));
     qInfo("Native style name is         : %s", qPrintable(QQuickStyle::name()));
 }
 
@@ -203,6 +203,7 @@ void tst_Baseline_Controls::runTest(const QString& style)
     QStringList args;
     if (!style.isEmpty())
         args.append({"-style", style});
+    args.append("-useAppWindow");
     if (renderAndGrab(qmlFile, args, &screenShot, &errorMessage)) {
         consecutiveErrors = 0;
     } else {
@@ -233,8 +234,9 @@ bool tst_Baseline_Controls::renderAndGrab(const QString& qmlFile, const QStringL
     bool res = usePipe ? img.load(&grabber, "ppm") : img.load(tmpfile);
     if (!res || img.isNull()) {
         if (errMsg) {
-            QString s("Failed to grab screen. qmlscenegrabber exitcode: %1. Process error: %2. Stderr:%3");
-            *errMsg = s.arg(grabber.exitCode()).arg(grabber.errorString()).arg(blockify(grabber.readAllStandardError()));
+            QString s("Failed to grab screen in %1. qmlscenegrabber exitcode: %2. Process error: %3. Stderr:%4");
+            *errMsg = s.arg(qmlFile).arg(grabber.exitCode())
+                       .arg(grabber.errorString()).arg(blockify(grabber.readAllStandardError()));
         }
         if (!usePipe)
             QFile::remove(tmpfile);