From 24decb49d6c53afa866644bbfb62bcde30cfe8fc Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Wed, 24 May 2017 10:46:07 +0200 Subject: winrt: Fix tst_QImageReader Change-Id: I3a7db49329d8f1677c17267f5878d5144ad37823 Reviewed-by: Friedemann Kleint --- tests/auto/gui/image/qimagereader/tst_qimagereader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/auto/gui') diff --git a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp index 18649b3de5..19948edcdf 100644 --- a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp +++ b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp @@ -193,7 +193,7 @@ void tst_QImageReader::getSetCheck() } tst_QImageReader::tst_QImageReader() : - m_temporaryDir(QStringLiteral("tst_qimagereaderXXXXXX")) + m_temporaryDir(QDir::tempPath() + QStringLiteral("/tst_qimagereaderXXXXXX")) { m_temporaryDir.setAutoRemove(true); } -- cgit v1.2.3 From 876aed331d7c6d7df81da1dace73dea49176ad1e Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Wed, 24 May 2017 10:45:37 +0200 Subject: Fix tst_QIcon for configurations with builtin_testdata Change-Id: Ibf9fcf7d3a8d58c9c488637a45985593950defaf Reviewed-by: Simon Hausmann --- tests/auto/gui/image/qicon/qicon.pro | 2 +- tests/auto/gui/image/qicon/tst_qicon.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/auto/gui') diff --git a/tests/auto/gui/image/qicon/qicon.pro b/tests/auto/gui/image/qicon/qicon.pro index f5570c2497..b3c60bf32b 100644 --- a/tests/auto/gui/image/qicon/qicon.pro +++ b/tests/auto/gui/image/qicon/qicon.pro @@ -4,6 +4,6 @@ TARGET = tst_qicon QT += testlib qtHaveModule(widgets): QT += widgets SOURCES += tst_qicon.cpp -RESOURCES = tst_qicon.qrc +RESOURCES = tst_qicon.qrc tst_qicon.cpp TESTDATA += icons/* second_icons/* *.png *.svg *.svgz diff --git a/tests/auto/gui/image/qicon/tst_qicon.cpp b/tests/auto/gui/image/qicon/tst_qicon.cpp index e031ffec71..175179699d 100644 --- a/tests/auto/gui/image/qicon/tst_qicon.cpp +++ b/tests/auto/gui/image/qicon/tst_qicon.cpp @@ -83,7 +83,7 @@ bool tst_QIcon::haveImageFormat(QByteArray const& desiredFormat) tst_QIcon::tst_QIcon() : m_pngImageFileName(QFINDTESTDATA("image.png")) , m_pngRectFileName(QFINDTESTDATA("rect.png")) - , m_sourceFileName(QFINDTESTDATA(__FILE__)) + , m_sourceFileName(":/tst_qicon.cpp") { } -- cgit v1.2.3 From da8701ff57c24127a81bf7c8c61bc09e6a214c3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Wed, 31 May 2017 15:32:47 +0300 Subject: Blacklist tst_QGuiEventLoop::processEvents in macOS 10.12 Task-number: QTBUG-61131 Change-Id: Ia54d0976f73e733199503e3510daf3d6fa4253a7 Reviewed-by: J-P Nurmi --- tests/auto/gui/kernel/qguieventloop/BLACKLIST | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 tests/auto/gui/kernel/qguieventloop/BLACKLIST (limited to 'tests/auto/gui') diff --git a/tests/auto/gui/kernel/qguieventloop/BLACKLIST b/tests/auto/gui/kernel/qguieventloop/BLACKLIST new file mode 100644 index 0000000000..d55c67998d --- /dev/null +++ b/tests/auto/gui/kernel/qguieventloop/BLACKLIST @@ -0,0 +1,2 @@ +[processEvents] +osx-10.12 -- cgit v1.2.3 From 68bcbe2470f1dec54b7803d847f7aa755b07c058 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 7 Jun 2017 16:20:10 +0200 Subject: Fix tst_QImageReader::imageFormatBeforeRead The test was never loading images from a valid path, and thus never had any fullfill the base option which meant nothing was tested. Making it work revealed that the Format option on BMP formats doesn't predict semi-transparent files. Change-Id: I7035a0f63ebfbce940ce7a17a6142cf177480798 Reviewed-by: Eirik Aavitsland --- tests/auto/gui/image/qimagereader/tst_qimagereader.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tests/auto/gui') diff --git a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp index 19948edcdf..574ad805ca 100644 --- a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp +++ b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp @@ -728,13 +728,15 @@ void tst_QImageReader::imageFormatBeforeRead() SKIP_IF_UNSUPPORTED(format); - QImageReader reader(fileName); + QImageReader reader(prefix + fileName); + QVERIFY(reader.canRead()); if (reader.supportsOption(QImageIOHandler::ImageFormat)) { QImage::Format fileFormat = reader.imageFormat(); QCOMPARE(fileFormat, imageFormat); QSize size = reader.size(); QImage image(size, fileFormat); QVERIFY(reader.read(&image)); + QEXPECT_FAIL("bmp-3", "Semi-transparent BMPs not predicted", Continue); QCOMPARE(image.format(), fileFormat); } } -- cgit v1.2.3