summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorQt CI Bot <qt_ci_bot@qt-project.org>2021-04-14 15:08:32 +0000
committerQt CI Bot <qt_ci_bot@qt-project.org>2021-04-14 15:08:32 +0000
commit5341569b41f0e5e2602fde0e88ceeac399a1f60f (patch)
treea6b6c477c1a57ba4d248edf5e6a41cbd95eb0940 /tests
parentfb0fcd7fe3f94a227dd66a110f5a3353008e37e5 (diff)
parentf4d791b330d02777fcaf02938732892eb3167e9b (diff)
Merge integration refs/builds/qtci/dev/1618401544
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/network/access/qnetworkcookie/tst_qnetworkcookie.cpp6
-rw-r--r--tests/auto/other/lancelot/scripts/tinydashes.qps34
2 files changed, 37 insertions, 3 deletions
diff --git a/tests/auto/network/access/qnetworkcookie/tst_qnetworkcookie.cpp b/tests/auto/network/access/qnetworkcookie/tst_qnetworkcookie.cpp
index b71934fc15..7f1b8e6369 100644
--- a/tests/auto/network/access/qnetworkcookie/tst_qnetworkcookie.cpp
+++ b/tests/auto/network/access/qnetworkcookie/tst_qnetworkcookie.cpp
@@ -688,11 +688,11 @@ void tst_QNetworkCookie::parseMultipleCookies()
void tst_QNetworkCookie::sameSite()
{
QList<QNetworkCookie> result = QNetworkCookie::parseCookies(QByteArrayLiteral("a=b;domain=qt-project.org"));
- QCOMPARE(result.first().sameSite(), QNetworkCookie::SameSite::Default);
+ QCOMPARE(result.first().sameSitePolicy(), QNetworkCookie::SameSite::Default);
result = QNetworkCookie::parseCookies(QByteArrayLiteral("a=b;domain=qt-project.org;samesite=strict"));
- QCOMPARE(result.first().sameSite(), QNetworkCookie::SameSite::Strict);
+ QCOMPARE(result.first().sameSitePolicy(), QNetworkCookie::SameSite::Strict);
result = QNetworkCookie::parseCookies(QByteArrayLiteral("a=b;domain=qt-project.org;samesite=none;secure"));
- QCOMPARE(result.first().sameSite(), QNetworkCookie::SameSite::None);
+ QCOMPARE(result.first().sameSitePolicy(), QNetworkCookie::SameSite::None);
QCOMPARE(result.first().toRawForm(), QByteArrayLiteral("a=b; secure; SameSite=None; domain=qt-project.org"));
}
diff --git a/tests/auto/other/lancelot/scripts/tinydashes.qps b/tests/auto/other/lancelot/scripts/tinydashes.qps
new file mode 100644
index 0000000000..d41ced7f5f
--- /dev/null
+++ b/tests/auto/other/lancelot/scripts/tinydashes.qps
@@ -0,0 +1,34 @@
+# Version: 1
+# CheckVsReference: 5%
+
+path_addEllipse mypath 20.0 20.0 200.0 200.0
+
+save
+setPen blue 20 SolidLine FlatCap
+pen_setCosmetic true
+pen_setDashPattern [ 0.0004 0.0004 ]
+setBrush yellow
+
+drawPath mypath
+translate 300 0
+setRenderHint Antialiasing true
+drawPath mypath
+restore
+
+path_addEllipse bigpath 200000.0 200000.0 2000000.0 2000000.0
+
+setPen blue 20 DotLine FlatCap
+setBrush yellow
+
+save
+translate 0 300
+scale 0.0001 0.00011
+drawPath bigpath
+restore
+
+save
+translate 300 300
+setRenderHint Antialiasing true
+scale 0.0001 0.00011
+drawPath bigpath
+restore