diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2017-05-30 09:11:28 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2017-06-02 08:18:51 +0000 |
| commit | ac02a71a9cb8e80014218ba7de46f4f914b6e00c (patch) | |
| tree | 88313cd9c7cb9c95188b7453349d808a614db759 /tests | |
| parent | 9f178cbe9ea27d247c82c7bbc396b1c3b264a06d (diff) | |
Revert "QQuickWindow::createTextureFromImage(): return nullptr for null images"
This reverts commit e6acf80136db9f667d0d4664f6c68065355d6811.
This breaks behavioral compatibility.
Task-number: QTBUG-61083
Change-Id: I0161d536502bab31aaf4ebc38f91e6c8842f72b0
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/quick/qquickwindow/tst_qquickwindow.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp index 639027d668..1d6547c5be 100644 --- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp +++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp @@ -375,8 +375,6 @@ private slots: void testDragEventPropertyPropagation(); - void createTextureFromImage(); - private: QTouchDevice *touchDevice; QTouchDevice *touchDeviceWithVelocity; @@ -2833,15 +2831,6 @@ 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" |