diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-06 20:18:01 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-06-06 20:18:01 +0000 |
| commit | 5624e82d068ebab254239121810fc097af7fcb40 (patch) | |
| tree | 27d4a45faaa7cf948a6700bc680c2684893f4e2e /tests/auto/quick/qquickwindow | |
| parent | d7b45f7dc1d5f28ecdb022c5a4c7673bc55257c8 (diff) | |
| parent | c254cec22a2352a3fcab60244a6ab74f95d45ace (diff) | |
Merge "Merge remote-tracking branch 'origin/5.9' into dev" into refs/staging/dev
Diffstat (limited to 'tests/auto/quick/qquickwindow')
| -rw-r--r-- | tests/auto/quick/qquickwindow/BLACKLIST | 4 | ||||
| -rw-r--r-- | tests/auto/quick/qquickwindow/tst_qquickwindow.cpp | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/tests/auto/quick/qquickwindow/BLACKLIST b/tests/auto/quick/qquickwindow/BLACKLIST deleted file mode 100644 index 157808fdbf..0000000000 --- a/tests/auto/quick/qquickwindow/BLACKLIST +++ /dev/null @@ -1,4 +0,0 @@ -[requestActivate] -osx-10.11 -[attachedProperty] -osx-10.11 diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp index d454f9b7bc..f2eb6a6685 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; @@ -2825,6 +2827,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" |