qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix baseline execution with native style 

Don't override the native style detection of Qt Quick Controls, let the
framework decide, and only print information about what to expect.
This fixes running the base line tests with the native windows style,
and has the benefit that we will see mismatches if the native style on
a platform changes.

Change-Id: I8e9e855e3acb6a38d46ae84a1ec2582d4eb22b0f
Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io>
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
This commit is contained in:
Volker Hilsheimer 2022-10-11 17:21:21 +02:00
parent 6874f5cf52
commit c1434d5216
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/baseline/controls/tst_baseline_controls.cpp
View File

@ -51,7 +51,7 @@ private Q_SLOTS:
void ios() { runTest("iOS"); }
#endif
void native_data() { setupTestSuite(); }
void native() { runTest(QQuickStyle::name()); }
void native() { runTest(); }
private:
void test();
@ -147,8 +147,9 @@ void tst_Baseline_Controls::initTestCase()
QSKIP(msg);
// let users know where they can find the results
qDebug() << "PlatformName computed to be:" << platformName;
qDebug() << "Appearance ID computed as:" << appearanceIdString;
qInfo("PlatformName computed to be : %s", qPrintable(platformName));
qInfo("Appearance ID computed as : %s", qPrintable(appearanceIdString));
qInfo("Native style name is : %s", qPrintable(QQuickStyle::name()));
}
void tst_Baseline_Controls::init()
@ -199,7 +200,10 @@ void tst_Baseline_Controls::runTest(const QString& style)
QImage screenShot;
QString errorMessage;
if (renderAndGrab(qmlFile, QStringList{"-style", style}, &screenShot, &errorMessage)) {
QStringList args;
if (!style.isEmpty())
args.append({"-style", style});
if (renderAndGrab(qmlFile, args, &screenShot, &errorMessage)) {
consecutiveErrors = 0;
} else {
if (++consecutiveErrors >= 3)