From e6acf80136db9f667d0d4664f6c68065355d6811 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Sat, 6 May 2017 22:32:57 +0200 Subject: QQuickWindow::createTextureFromImage(): return nullptr for null images Change-Id: Idf3315be104e058315d82893443e1c27d1d79f2e Reviewed-by: Laszlo Agocs --- tests/auto/quick/qquickwindow/tst_qquickwindow.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'tests/auto/quick/qquickwindow') diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp index 1d6547c5be..639027d668 100644 --- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp +++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp @@ -375,6 +375,8 @@ private slots: void testDragEventPropertyPropagation(); + void createTextureFromImage(); + private: QTouchDevice *touchDevice; QTouchDevice *touchDeviceWithVelocity; @@ -2831,6 +2833,15 @@ void tst_qquickwindow::testDragEventPropertyPropagation() } } +void tst_qquickwindow::createTextureFromImage() +{ + // An invalid image should return a null pointer. + QQuickWindow window; + window.show(); + QTest::qWaitForWindowExposed(&window); + QVERIFY(!window.createTextureFromImage(QImage())); +} + QTEST_MAIN(tst_qquickwindow) #include "tst_qquickwindow.moc" -- cgit v1.2.3 From 01ca4aa2d0de2f519ba7f1753894903dd1a3a712 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 5 May 2017 07:57:27 +0000 Subject: Revert "Blacklist tst_qquickwindows::requestActivate in macOS 10.11" This reverts commit 3063599da646f00fc80e42933358935e6565d7b2. Commit 7937eb2d9e19bef89f49db2d510b033f6281af5b could possibly have fixed this autotest. Task-number: QTBUG-59857 Change-Id: Id5dcc46774696b67acfb7d93a46f384bb600fe56 Reviewed-by: Liang Qi Reviewed-by: Shawn Rutledge --- tests/auto/quick/qquickwindow/BLACKLIST | 2 -- 1 file changed, 2 deletions(-) (limited to 'tests/auto/quick/qquickwindow') diff --git a/tests/auto/quick/qquickwindow/BLACKLIST b/tests/auto/quick/qquickwindow/BLACKLIST index 157808fdbf..a4a2de4b96 100644 --- a/tests/auto/quick/qquickwindow/BLACKLIST +++ b/tests/auto/quick/qquickwindow/BLACKLIST @@ -1,4 +1,2 @@ -[requestActivate] -osx-10.11 [attachedProperty] osx-10.11 -- cgit v1.2.3 From 43d34fd6f96ed6b07fe79cf1637d5ec66cc97f4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 5 May 2017 14:33:15 +0300 Subject: Revert "Blacklist tst_qquickwindow::attachedProperty on macOS 10.11" This reverts commit 90e7521313fc9e89d492d65f9ad0dca3c38e7225. Commit 7937eb2d9e19bef89f49db2d510b033f6281af5b could possibly have fixed this autotest. Task-number: QTBUG-60052 Change-Id: I142ea04ef6329a9b1919ac17c427e470083651a8 Reviewed-by: Liang Qi --- tests/auto/quick/qquickwindow/BLACKLIST | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 tests/auto/quick/qquickwindow/BLACKLIST (limited to 'tests/auto/quick/qquickwindow') diff --git a/tests/auto/quick/qquickwindow/BLACKLIST b/tests/auto/quick/qquickwindow/BLACKLIST deleted file mode 100644 index a4a2de4b96..0000000000 --- a/tests/auto/quick/qquickwindow/BLACKLIST +++ /dev/null @@ -1,2 +0,0 @@ -[attachedProperty] -osx-10.11 -- cgit v1.2.3