diff options
Diffstat (limited to 'tests/auto/gui/image')
-rw-r--r-- | tests/auto/gui/image/CMakeLists.txt | 28 | ||||
-rw-r--r-- | tests/auto/gui/image/qicoimageformat/CMakeLists.txt | 49 | ||||
-rw-r--r-- | tests/auto/gui/image/qicon/CMakeLists.txt | 94 | ||||
-rw-r--r-- | tests/auto/gui/image/qiconhighdpi/CMakeLists.txt | 37 | ||||
-rw-r--r-- | tests/auto/gui/image/qiconhighdpi/qiconhighdpi.pro | 2 | ||||
-rw-r--r-- | tests/auto/gui/image/qimage/CMakeLists.txt | 66 | ||||
-rw-r--r-- | tests/auto/gui/image/qimage/tst_qimage.cpp | 47 | ||||
-rw-r--r-- | tests/auto/gui/image/qimageiohandler/CMakeLists.txt | 13 | ||||
-rw-r--r-- | tests/auto/gui/image/qimagereader/CMakeLists.txt | 65 | ||||
-rw-r--r-- | tests/auto/gui/image/qimagewriter/CMakeLists.txt | 50 | ||||
-rw-r--r-- | tests/auto/gui/image/qmovie/CMakeLists.txt | 56 | ||||
-rw-r--r-- | tests/auto/gui/image/qpicture/CMakeLists.txt | 13 | ||||
-rw-r--r-- | tests/auto/gui/image/qpixmap/CMakeLists.txt | 107 | ||||
-rw-r--r-- | tests/auto/gui/image/qpixmap/tst_qpixmap.cpp | 1 | ||||
-rw-r--r-- | tests/auto/gui/image/qpixmapcache/CMakeLists.txt | 4 |
15 files changed, 609 insertions, 23 deletions
diff --git a/tests/auto/gui/image/CMakeLists.txt b/tests/auto/gui/image/CMakeLists.txt index 8636d74c15..8ae016a8f8 100644 --- a/tests/auto/gui/image/CMakeLists.txt +++ b/tests/auto/gui/image/CMakeLists.txt @@ -1,15 +1,17 @@ -if (QT_FEATURE_network) -# add_subdirectory("qimagereader") +# Generated from image.pro. + +if(TARGET Qt::Network) + add_subdirectory(qimagereader) endif() -# add_subdirectory("qicoimageformat") -# add_subdirectory("qpixmap") -if (QT_FEATURE_private_tests) - add_subdirectory("qpixmapcache") +add_subdirectory(qicoimageformat) +add_subdirectory(qpixmap) +add_subdirectory(qimage) +add_subdirectory(qimageiohandler) +add_subdirectory(qimagewriter) +add_subdirectory(qmovie) +add_subdirectory(qpicture) +add_subdirectory(qicon) +add_subdirectory(qiconhighdpi) +if(QT_FEATURE_private_tests) + add_subdirectory(qpixmapcache) endif() -# add_subdirectory("qimage") -add_subdirectory("qimageiohandler") -# add_subdirectory("qimagewriter") -# add_subdirectory("qmovie") -add_subdirectory("qpicture") -# add_subdirectory("qicon") -# add_subdirectory("qiconhighdpi") diff --git a/tests/auto/gui/image/qicoimageformat/CMakeLists.txt b/tests/auto/gui/image/qicoimageformat/CMakeLists.txt new file mode 100644 index 0000000000..0c8393631a --- /dev/null +++ b/tests/auto/gui/image/qicoimageformat/CMakeLists.txt @@ -0,0 +1,49 @@ +# Generated from qicoimageformat.pro. + +##################################################################### +## tst_qicoimageformat Test: +##################################################################### + +# Collect test data +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + icons/*) +list(APPEND test_data ${test_data_glob}) + +add_qt_test(tst_qicoimageformat + SOURCES + tst_qicoimageformat.cpp + PUBLIC_LIBRARIES + Qt::Gui + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +if(ANDROID) + # Resources: + set(qicoimageformat_resource_files + "icons/invalid/35floppy.ico" + "icons/valid/35FLOPPY.ICO" + "icons/valid/AddPerfMon.ico" + "icons/valid/App.ico" + "icons/valid/Obj_N2_Internal_Mem.ico" + "icons/valid/Qt.ico" + "icons/valid/Status_Play.ico" + "icons/valid/TIMER01.ICO" + "icons/valid/WORLD.ico" + "icons/valid/WORLDH.ico" + "icons/valid/abcardWindow.ico" + "icons/valid/semitransparent.ico" + "icons/valid/trolltechlogo_tiny.ico" + "icons/valid/yellow.cur" + ) + + add_qt_resource(tst_qicoimageformat "qicoimageformat" + PREFIX + "/" + FILES + ${qicoimageformat_resource_files} + ) +endif() diff --git a/tests/auto/gui/image/qicon/CMakeLists.txt b/tests/auto/gui/image/qicon/CMakeLists.txt new file mode 100644 index 0000000000..81f5390d79 --- /dev/null +++ b/tests/auto/gui/image/qicon/CMakeLists.txt @@ -0,0 +1,94 @@ +# Generated from qicon.pro. + +##################################################################### +## tst_qicon Test: +##################################################################### + +# Collect test data +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + icons/*) +list(APPEND test_data ${test_data_glob}) +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + second_icons/*) +list(APPEND test_data ${test_data_glob}) +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + fallback_icons/*) +list(APPEND test_data ${test_data_glob}) +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + *.png) +list(APPEND test_data ${test_data_glob}) +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + *.svg) +list(APPEND test_data ${test_data_glob}) +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + *.svgz) +list(APPEND test_data ${test_data_glob}) + +add_qt_test(tst_qicon + SOURCES + tst_qicon.cpp + PUBLIC_LIBRARIES + Qt::Gui + TESTDATA ${test_data} +) + +# Resources: +set(tst_qicon_resource_files + "./fallback_icons/red.png" + "./icons/testtheme/16x16/actions/appointment-new.png" + "./icons/testtheme/22x22/actions/appointment-new.png" + "./icons/testtheme/index.theme" + "./icons/testtheme/scalable/actions/svg-only.svg" + "./icons/themeparent/16x16/actions/address-book-new.png" + "./icons/themeparent/16x16/actions/appointment-new.png" + "./icons/themeparent/22x22/actions/address-book-new.png" + "./icons/themeparent/22x22/actions/appointment-new.png" + "./icons/themeparent/32x32/actions/address-book-new.png" + "./icons/themeparent/32x32/actions/appointment-new.png" + "./icons/themeparent/icon-theme.cache" + "./icons/themeparent/index.theme" + "./icons/themeparent/scalable/actions/address-book-new.svg" + "./icons/themeparent/scalable/actions/appointment-new.svg" + "./second_icons/testtheme/32x32/actions/appointment-new.png" + "./styles/commonstyle/images/standardbutton-open-128.png" + "./styles/commonstyle/images/standardbutton-open-16.png" + "./styles/commonstyle/images/standardbutton-open-32.png" + "./styles/commonstyle/images/standardbutton-save-128.png" + "./styles/commonstyle/images/standardbutton-save-16.png" + "./styles/commonstyle/images/standardbutton-save-32.png" + "image.png" + "rect.png" + "tst_qicon.cpp" +) + +add_qt_resource(tst_qicon "tst_qicon" + PREFIX + "/" + FILES + ${tst_qicon_resource_files} +) +set(qmake_immediate_resource_files + "tst_qicon.cpp" +) + +add_qt_resource(tst_qicon "qmake_immediate" + PREFIX + "/" + FILES + ${qmake_immediate_resource_files} +) + + +## Scopes: +##################################################################### + +extend_target(tst_qicon CONDITION TARGET Qt::Widgets + PUBLIC_LIBRARIES + Qt::Widgets +) diff --git a/tests/auto/gui/image/qiconhighdpi/CMakeLists.txt b/tests/auto/gui/image/qiconhighdpi/CMakeLists.txt new file mode 100644 index 0000000000..6f6aaedca5 --- /dev/null +++ b/tests/auto/gui/image/qiconhighdpi/CMakeLists.txt @@ -0,0 +1,37 @@ +# Generated from qiconhighdpi.pro. + +##################################################################### +## tst_qiconhighdpi Test: +##################################################################### + +# Collect test data +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + icons/*) +list(APPEND test_data ${test_data_glob}) + +add_qt_test(tst_qiconhighdpi + SOURCES + tst_qiconhighdpi.cpp + PUBLIC_LIBRARIES + Qt::Gui + TESTDATA ${test_data} +) + +# Resources: +set(tst_qiconhighdpi_resource_files + "icons/misc/button.9.png" + "icons/misc/button@2x.9.png" + "icons/testtheme/16x16/actions/appointment-new.png" + "icons/testtheme/22x22/actions/appointment-new.png" + "icons/testtheme/22x22@2/actions/appointment-new.png" + "icons/testtheme/index.theme" +) + +add_qt_resource(tst_qiconhighdpi "tst_qiconhighdpi" + PREFIX + "/" + FILES + ${tst_qiconhighdpi_resource_files} +) + diff --git a/tests/auto/gui/image/qiconhighdpi/qiconhighdpi.pro b/tests/auto/gui/image/qiconhighdpi/qiconhighdpi.pro index 17553158bc..49c615721b 100644 --- a/tests/auto/gui/image/qiconhighdpi/qiconhighdpi.pro +++ b/tests/auto/gui/image/qiconhighdpi/qiconhighdpi.pro @@ -1,5 +1,5 @@ CONFIG += testcase -TARGET = tst_qicon +TARGET = tst_qiconhighdpi QT += testlib SOURCES += tst_qiconhighdpi.cpp diff --git a/tests/auto/gui/image/qimage/CMakeLists.txt b/tests/auto/gui/image/qimage/CMakeLists.txt new file mode 100644 index 0000000000..865f1124b9 --- /dev/null +++ b/tests/auto/gui/image/qimage/CMakeLists.txt @@ -0,0 +1,66 @@ +# Generated from qimage.pro. + +##################################################################### +## tst_qimage Test: +##################################################################### + +# Collect test data +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + images/*) +list(APPEND test_data ${test_data_glob}) + +add_qt_test(tst_qimage + SOURCES + tst_qimage.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + TESTDATA ${test_data} +) + +## Scopes: +##################################################################### + +if(ANDROID AND NOT ANDROID_EMBEDDED) + # Resources: + set(qimage_resource_files + "images/image.bmp" + "images/image.gif" + "images/image.ico" + "images/image.jpg" + "images/image.pbm" + "images/image.pgm" + "images/image.png" + "images/image.ppm" + "images/image.xbm" + "images/image.xpm" + "images/jpeg_exif_orientation_value_1.jpg" + "images/jpeg_exif_orientation_value_2.jpg" + "images/jpeg_exif_orientation_value_3.jpg" + "images/jpeg_exif_orientation_value_4.jpg" + "images/jpeg_exif_orientation_value_5.jpg" + "images/jpeg_exif_orientation_value_6.jpg" + "images/jpeg_exif_orientation_value_7.jpg" + "images/jpeg_exif_orientation_value_8.jpg" + ) + + add_qt_resource(tst_qimage "qimage" + PREFIX + "/" + FILES + ${qimage_resource_files} + ) +endif() + +extend_target(tst_qimage CONDITION WIN32 AND NOT WINRT + PUBLIC_LIBRARIES + gdi32 + user32 +) + +extend_target(tst_qimage CONDITION APPLE + PUBLIC_LIBRARIES + ${FWCoreGraphics} +) diff --git a/tests/auto/gui/image/qimage/tst_qimage.cpp b/tests/auto/gui/image/qimage/tst_qimage.cpp index b84aa52465..71aaa23da4 100644 --- a/tests/auto/gui/image/qimage/tst_qimage.cpp +++ b/tests/auto/gui/image/qimage/tst_qimage.cpp @@ -32,7 +32,7 @@ #include <qimage.h> #include <qimagereader.h> #include <qlist.h> -#include <qmatrix.h> +#include <qtransform.h> #include <qrandom.h> #include <stdio.h> @@ -191,6 +191,8 @@ private slots: void invertPixelsRGB_data(); void invertPixelsRGB(); + void invertPixelsIndexed(); + void exifOrientation_data(); void exifOrientation(); @@ -924,6 +926,9 @@ void tst_QImage::convertToFormat_data() QTest::newRow("blue rgb30 -> argb32") << int(QImage::Format_RGB30) << 0xff0000ff << int(QImage::Format_ARGB32) << 0xff0000ff; + QTest::newRow("semigray argb32 -> a2rgb30 pm") << int(QImage::Format_ARGB32) << 0x4c646565u + << int(QImage::Format_A2RGB30_Premultiplied) << 0x55212222u; + QTest::newRow("white gray8 -> argb pm") << int(QImage::Format_Grayscale8) << 0xfffffeffu << int(QImage::Format_ARGB32_Premultiplied) << 0xfffefefeu; QTest::newRow("gray gray8 -> argb pm") << int(QImage::Format_Grayscale8) << 0xff565557u @@ -1199,7 +1204,7 @@ void tst_QImage::rotate() // original.save("rotated90_original.png", "png"); // Initialize the matrix manually (do not use rotate) to avoid rounding errors - QMatrix matRotate90; + QTransform matRotate90; matRotate90.rotate(degrees); QImage dest = original; // And rotate it 4 times, then the image should be identical to the original @@ -1213,7 +1218,7 @@ void tst_QImage::rotate() // dest.save("rotated90_result.png","png"); QCOMPARE(original, dest); - // Test with QMatrix::rotate 90 also, since we trust that now + // Test with QTransform::rotate 90 also, since we trust that now matRotate90.rotate(degrees); dest = original; // And rotate it 4 times, then the image should be identical to the original @@ -2132,6 +2137,12 @@ void tst_QImage::paintEngine() QCOMPARE(engine, img.paintEngine()); QCOMPARE(img, expected); + + { + QImage img1(16, 16, QImage::Format_ARGB32); + QImage img2 = img1; + QVERIFY(img2.paintEngine()); + } } void tst_QImage::setAlphaChannelWhilePainting() @@ -3077,6 +3088,36 @@ void tst_QImage::invertPixelsRGB() QCOMPARE(qBlue(pixel) >> 4, (255 - 96) >> 4); } +void tst_QImage::invertPixelsIndexed() +{ + { + QImage image(1, 1, QImage::Format_Mono); + image.fill(Qt::color1); + image.invertPixels(); + QCOMPARE(image.pixelIndex(0, 0), 0); + } + { + QImage image(1, 1, QImage::Format_MonoLSB); + image.fill(Qt::color0); + image.invertPixels(); + QCOMPARE(image.pixelIndex(0, 0), 1); + } + { + QImage image(1, 1, QImage::Format_Indexed8); + image.setColorTable({0xff000000, 0xffffffff}); + image.fill(Qt::black); + image.invertPixels(); + QCOMPARE(image.pixelIndex(0, 0), 255); + } + { + QImage image(1, 1, QImage::Format_Indexed8); + image.setColorTable({0xff000000, 0xffffffff, 0x80000000, 0x80ffffff, 0x00000000}); + image.fill(Qt::white); + image.invertPixels(); + QCOMPARE(image.pixelIndex(0, 0), 254); + } +} + void tst_QImage::exifOrientation_data() { QTest::addColumn<QString>("fileName"); diff --git a/tests/auto/gui/image/qimageiohandler/CMakeLists.txt b/tests/auto/gui/image/qimageiohandler/CMakeLists.txt index fbefeb26d8..23e5e98b16 100644 --- a/tests/auto/gui/image/qimageiohandler/CMakeLists.txt +++ b/tests/auto/gui/image/qimageiohandler/CMakeLists.txt @@ -1 +1,12 @@ -add_qt_test(tst_qimageiohandler SOURCES tst_qimageiohandler.cpp LIBRARIES Qt::Gui) +# Generated from qimageiohandler.pro. + +##################################################################### +## tst_qimageiohandler Test: +##################################################################### + +add_qt_test(tst_qimageiohandler + SOURCES + tst_qimageiohandler.cpp + PUBLIC_LIBRARIES + Qt::Gui +) diff --git a/tests/auto/gui/image/qimagereader/CMakeLists.txt b/tests/auto/gui/image/qimagereader/CMakeLists.txt new file mode 100644 index 0000000000..8a96fa18cf --- /dev/null +++ b/tests/auto/gui/image/qimagereader/CMakeLists.txt @@ -0,0 +1,65 @@ +# Generated from qimagereader.pro. + +##################################################################### +## tst_qimagereader Test: +##################################################################### + +# Collect test data +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + images/*) +list(APPEND test_data ${test_data_glob}) +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + baseline/*) +list(APPEND test_data ${test_data_glob}) + +add_qt_test(tst_qimagereader + SOURCES + tst_qimagereader.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::Network + TESTDATA ${test_data} +) + +file(GLOB resource_glob_0 RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "images/*") +foreach(file IN LISTS resource_glob_0) + set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/${file}" PROPERTIES QT_RESOURCE_ALIAS "${file}") +endforeach() + +# Resources: +set(qmake_immediate_resource_files + ${resource_glob_0} +) + +add_qt_resource(tst_qimagereader "qmake_immediate" + PREFIX + "/" + FILES + ${qmake_immediate_resource_files} +) + + +#### Keys ignored in scope 1:.:.:qimagereader.pro:<TRUE>: +# MOC_DIR = "tmp" + +## Scopes: +##################################################################### + +if(ANDROID AND NOT ANDROID_EMBEDDED) + # Resources: + set(android_testdata_resource_files + "images/kollada-noext" + "images/trans.gif" + ) + + add_qt_resource(tst_qimagereader "android_testdata" + PREFIX + "/" + FILES + ${android_testdata_resource_files} + ) +endif() diff --git a/tests/auto/gui/image/qimagewriter/CMakeLists.txt b/tests/auto/gui/image/qimagewriter/CMakeLists.txt new file mode 100644 index 0000000000..1a04dfbce0 --- /dev/null +++ b/tests/auto/gui/image/qimagewriter/CMakeLists.txt @@ -0,0 +1,50 @@ +# Generated from qimagewriter.pro. + +##################################################################### +## tst_qimagewriter Test: +##################################################################### + +# Collect test data +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + images/*) +list(APPEND test_data ${test_data_glob}) + +add_qt_test(tst_qimagewriter + SOURCES + tst_qimagewriter.cpp + PUBLIC_LIBRARIES + Qt::Gui + TESTDATA ${test_data} +) + +#### Keys ignored in scope 1:.:.:qimagewriter.pro:<TRUE>: +# MOC_DIR = "tmp" + +## Scopes: +##################################################################### + +if(ANDROID AND NOT ANDROID_EMBEDDED) + # Resources: + set(qimagewriter_resource_files + "images/YCbCr_cmyk.jpg" + "images/YCbCr_rgb.jpg" + "images/beavis.jpg" + "images/colorful.bmp" + "images/earth.gif" + "images/font.bmp" + "images/gnus.xbm" + "images/kollada.png" + "images/marble.xpm" + "images/ship63.pbm" + "images/teapot.ppm" + "images/trolltech.gif" + ) + + add_qt_resource(tst_qimagewriter "qimagewriter" + PREFIX + "/" + FILES + ${qimagewriter_resource_files} + ) +endif() diff --git a/tests/auto/gui/image/qmovie/CMakeLists.txt b/tests/auto/gui/image/qmovie/CMakeLists.txt new file mode 100644 index 0000000000..bc841b5d29 --- /dev/null +++ b/tests/auto/gui/image/qmovie/CMakeLists.txt @@ -0,0 +1,56 @@ +# Generated from qmovie.pro. + +##################################################################### +## tst_qmovie Test: +##################################################################### + +# Collect test data +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + animations/*) +list(APPEND test_data ${test_data_glob}) + +add_qt_test(tst_qmovie + SOURCES + tst_qmovie.cpp + PUBLIC_LIBRARIES + Qt::Gui + TESTDATA ${test_data} +) + +# Resources: +set(resources_resource_files + "animations/comicsecard.gif" + "animations/corrupt.gif" + "animations/trolltech.gif" +) + +add_qt_resource(tst_qmovie "resources" + PREFIX + "/" + FILES + ${resources_resource_files} +) + + +#### Keys ignored in scope 1:.:.:qmovie.pro:<TRUE>: +# MOC_DIR = "tmp" +# QT_FOR_CONFIG = "gui-private" + +## Scopes: +##################################################################### + +extend_target(tst_qmovie CONDITION TARGET Qt::Widgets + PUBLIC_LIBRARIES + Qt::Widgets +) + +extend_target(tst_qmovie CONDITION QT_FEATURE_gif + DEFINES + QTEST_HAVE_GIF +) + +extend_target(tst_qmovie CONDITION QT_FEATURE_jpeg + DEFINES + QTEST_HAVE_JPEG +) diff --git a/tests/auto/gui/image/qpicture/CMakeLists.txt b/tests/auto/gui/image/qpicture/CMakeLists.txt index c3db4ffb25..625d19b3a5 100644 --- a/tests/auto/gui/image/qpicture/CMakeLists.txt +++ b/tests/auto/gui/image/qpicture/CMakeLists.txt @@ -1 +1,12 @@ -add_qt_test(tst_qpicture SOURCES tst_qpicture.cpp LIBRARIES Qt::Gui) +# Generated from qpicture.pro. + +##################################################################### +## tst_qpicture Test: +##################################################################### + +add_qt_test(tst_qpicture + SOURCES + tst_qpicture.cpp + PUBLIC_LIBRARIES + Qt::Gui +) diff --git a/tests/auto/gui/image/qpixmap/CMakeLists.txt b/tests/auto/gui/image/qpixmap/CMakeLists.txt new file mode 100644 index 0000000000..f6a83aa0da --- /dev/null +++ b/tests/auto/gui/image/qpixmap/CMakeLists.txt @@ -0,0 +1,107 @@ +# Generated from qpixmap.pro. + +##################################################################### +## tst_qpixmap Test: +##################################################################### + +# Collect test data +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + convertFromImage/*) +list(APPEND test_data ${test_data_glob}) +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + convertFromToHICON/*) +list(APPEND test_data ${test_data_glob}) +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + loadFromData/*) +list(APPEND test_data ${test_data_glob}) +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + images/*) +list(APPEND test_data ${test_data_glob}) + +add_qt_test(tst_qpixmap + SOURCES + tst_qpixmap.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + TESTDATA ${test_data} +) + +# Resources: +set(qpixmap_resource_files + "convertFromImage/task31722_0/img1.png" + "convertFromImage/task31722_0/img2.png" + "convertFromImage/task31722_1/img1.png" + "convertFromImage/task31722_1/img2.png" + "convertFromToHICON/icon_32bpp.ico" + "convertFromToHICON/icon_32bpp_16x16.png" + "convertFromToHICON/icon_32bpp_256x256.png" + "convertFromToHICON/icon_32bpp_32x32.png" + "convertFromToHICON/icon_32bpp_48x48.png" + "convertFromToHICON/icon_8bpp.ico" + "convertFromToHICON/icon_8bpp_16x16.png" + "convertFromToHICON/icon_8bpp_32x32.png" + "convertFromToHICON/icon_8bpp_48x48.png" + "images/designer.png" + "images/dx_-10_dy_-10_50_50_100_100.png" + "images/dx_-10_dy_-10_x_y_w_h.png" + "images/dx_-10_dy_0_50_50_100_100.png" + "images/dx_-10_dy_0_x_y_w_h.png" + "images/dx_-128_dy_-128_x_y_w_h.png" + "images/dx_-128_dy_0_x_y_w_h.png" + "images/dx_0_dy_-10_50_50_100_100.png" + "images/dx_0_dy_-10_x_y_w_h.png" + "images/dx_0_dy_-128_x_y_w_h.png" + "images/dx_0_dy_0_50_50_100_100.png" + "images/dx_0_dy_0_null.png" + "images/dx_0_dy_0_x_y_w_h.png" + "images/dx_0_dy_10_50_50_100_100.png" + "images/dx_0_dy_10_x_y_w_h.png" + "images/dx_0_dy_128_x_y_w_h.png" + "images/dx_0_dy_1_null.png" + "images/dx_10_dy_0_50_50_100_100.png" + "images/dx_10_dy_0_x_y_w_h.png" + "images/dx_10_dy_10_50_50_100_100.png" + "images/dx_10_dy_10_x_y_w_h.png" + "images/dx_128_dy_0_x_y_w_h.png" + "images/dx_128_dy_128_64_64_128_128.png" + "images/dx_128_dy_128_x_y_w_h.png" + "images/dx_1_dy_0_null.png" + "loadFromData/designer_argb32.png" + "loadFromData/designer_indexed8_no_alpha.gif" + "loadFromData/designer_indexed8_no_alpha.png" + "loadFromData/designer_indexed8_no_alpha_animated.gif" + "loadFromData/designer_indexed8_with_alpha.gif" + "loadFromData/designer_indexed8_with_alpha.png" + "loadFromData/designer_indexed8_with_alpha_animated.gif" + "loadFromData/designer_rgb32.jpg" + "loadFromData/designer_rgb32.png" +) + +add_qt_resource(tst_qpixmap "qpixmap" + PREFIX + "/" + FILES + ${qpixmap_resource_files} +) + + +## Scopes: +##################################################################### + +extend_target(tst_qpixmap CONDITION TARGET Qt::Widgets + PUBLIC_LIBRARIES + Qt::Widgets + Qt::WidgetsPrivate +) + +extend_target(tst_qpixmap CONDITION WIN32 AND NOT WINRT + PUBLIC_LIBRARIES + gdi32 + user32 +) diff --git a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp index ba5df809f2..1d77f70919 100644 --- a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp +++ b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp @@ -32,7 +32,6 @@ #include <qbitmap.h> #include <qimage.h> #include <qimagereader.h> -#include <qmatrix.h> #ifndef QT_NO_WIDGETS #include <qdesktopwidget.h> #include <qsplashscreen.h> diff --git a/tests/auto/gui/image/qpixmapcache/CMakeLists.txt b/tests/auto/gui/image/qpixmapcache/CMakeLists.txt index bfdfdae2f3..ef73f60ca6 100644 --- a/tests/auto/gui/image/qpixmapcache/CMakeLists.txt +++ b/tests/auto/gui/image/qpixmapcache/CMakeLists.txt @@ -5,11 +5,9 @@ ##################################################################### add_qt_test(tst_qpixmapcache - GUI SOURCES tst_qpixmapcache.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) |