diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2018-01-19 09:05:14 +0100 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2018-02-05 08:00:54 +0000 |
| commit | f252b5229dc291cbf0773d2252068b0b2a6d7c9e (patch) | |
| tree | ebcced04be5083e40acf9d0bb257aa41041f63ef | |
| parent | 61a32b78db418936ca7987ff859f9e62f84cbd06 (diff) | |
tst_qquickcanvasitem: only run tiff tests if imageformats is installed
Use the new QQuickTestSetup class to set a context property that tells
the QML testcase whether or not qtimageformats is available.
Task-number: QTBUG-23980
Change-Id: Iddf093d422054c93fac6d908684733e71cfaa7c8
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
3 files changed, 31 insertions, 2 deletions
diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_canvas.qml b/tests/auto/quick/qquickcanvasitem/data/tst_canvas.qml index 565f906fb1..8238d87313 100644 --- a/tests/auto/quick/qquickcanvasitem/data/tst_canvas.qml +++ b/tests/auto/quick/qquickcanvasitem/data/tst_canvas.qml @@ -151,9 +151,11 @@ CanvasTestCase { {mimeType:"image/bmp"}, {mimeType:"image/jpeg"}, {mimeType:"image/x-portable-pixmap"}, - //{mimeType:"image/tiff"}, QTBUG-23980 {mimeType:"image/xpm"}, ]; + if (hasImageFormats) + imageTypes.push({ mimeType: "image/tiff" }); + for (var i = 0; i < imageTypes.length; i++) { ctx.fillStyle = "red"; ctx.fillRect(0, 0, c.width, c.height); diff --git a/tests/auto/quick/qquickcanvasitem/qquickcanvasitem.pro b/tests/auto/quick/qquickcanvasitem/qquickcanvasitem.pro index c6d2a69f8c..845128f9de 100644 --- a/tests/auto/quick/qquickcanvasitem/qquickcanvasitem.pro +++ b/tests/auto/quick/qquickcanvasitem/qquickcanvasitem.pro @@ -5,6 +5,8 @@ TARGET=tst_qquickcanvasitem CONFIG += qmltestcase SOURCES += tst_qquickcanvasitem.cpp +exists($$[QT_INSTALL_PLUGINS]/imageformats): DEFINES += HAS_IMAGE_FORMATS + TESTDATA = data/* OTHER_FILES += \ diff --git a/tests/auto/quick/qquickcanvasitem/tst_qquickcanvasitem.cpp b/tests/auto/quick/qquickcanvasitem/tst_qquickcanvasitem.cpp index bde2b4809b..dad8df0682 100644 --- a/tests/auto/quick/qquickcanvasitem/tst_qquickcanvasitem.cpp +++ b/tests/auto/quick/qquickcanvasitem/tst_qquickcanvasitem.cpp @@ -26,4 +26,29 @@ ** ****************************************************************************/ #include <QtQuickTest/quicktest.h> -QUICK_TEST_MAIN(qquickcanvasitem) +#include <QtQml/qqmlengine.h> +#include <QtQml/qqmlcontext.h> + +class Setup : public QObject +{ + Q_OBJECT + +public: + Setup() {} + +public slots: + void qmlEngineAvailable(QQmlEngine *engine) + { + engine->rootContext()->setContextProperty("hasImageFormats", QVariant( +#ifdef HAS_IMAGE_FORMATS + true +#else + false +#endif + )); + } +}; + +QUICK_TEST_MAIN_WITH_SETUP(qquickcanvasitem, Setup) + +#include "tst_qquickcanvasitem.moc" |