From a90f50942e5304e6bf1c8a3e32f1f65c7a38f60b Mon Sep 17 00:00:00 2001 From: Jo Asplin Date: Wed, 31 Aug 2011 17:11:06 +0200 Subject: [PATCH] Moved gui autotests into new directory structure Task-number: QTBUG-21133 Change-Id: I83b8f652935cf92151265ca2530a3cf81c31fdef Reviewed-on: http://codereview.qt.nokia.com/3996 Reviewed-by: Qt Sanity Bot Reviewed-by: Jo Asplin --- tests/auto/corelib.pro | 1 - tests/auto/gui.pro | 60 +----------------- tests/auto/gui/gui.pro | 9 +++ tests/auto/gui/image/image.pro | 18 ++++++ .../image}/qicoimageformat/.gitignore | 0 .../icons/invalid/35floppy.ico | Bin .../qicoimageformat/icons/valid/35FLOPPY.ICO | Bin .../icons/valid/AddPerfMon.ico | Bin .../qicoimageformat/icons/valid/App.ico | Bin .../icons/valid/Obj_N2_Internal_Mem.ico | Bin .../image}/qicoimageformat/icons/valid/Qt.ico | Bin .../icons/valid/Status_Play.ico | Bin .../qicoimageformat/icons/valid/TIMER01.ICO | Bin .../qicoimageformat/icons/valid/WORLD.ico | Bin .../qicoimageformat/icons/valid/WORLDH.ico | Bin .../icons/valid/abcardWindow.ico | Bin .../icons/valid/semitransparent.ico | Bin .../icons/valid/trolltechlogo_tiny.ico | Bin .../qicoimageformat/qicoimageformat.pro | 0 .../qicoimageformat/tst_qicoimageformat.cpp | 0 tests/auto/{ => gui/image}/qicon/.gitignore | 0 tests/auto/{ => gui/image}/qicon/heart.svg | 0 tests/auto/{ => gui/image}/qicon/heart.svgz | Bin .../16x16/actions/appointment-new.png | Bin .../22x22/actions/appointment-new.png | Bin .../32x32/actions/appointment-new.png | Bin .../image}/qicon/icons/testtheme/index.theme | 0 .../testtheme/scalable/actions/svg-only.svg | 0 .../16x16/actions/address-book-new.png | Bin .../16x16/actions/appointment-new.png | Bin .../22x22/actions/address-book-new.png | Bin .../22x22/actions/appointment-new.png | Bin .../32x32/actions/address-book-new.png | Bin .../32x32/actions/appointment-new.png | Bin .../qicon/icons/themeparent/index.theme | 0 .../scalable/actions/address-book-new.svg | 0 .../scalable/actions/appointment-new.svg | 0 tests/auto/{ => gui/image}/qicon/image.png | Bin tests/auto/{ => gui/image}/qicon/qicon.pro | 0 tests/auto/{ => gui/image}/qicon/rect.png | Bin tests/auto/{ => gui/image}/qicon/rect.svg | 0 tests/auto/{ => gui/image}/qicon/trash.svg | 0 .../auto/{ => gui/image}/qicon/tst_qicon.cpp | 0 .../auto/{ => gui/image}/qicon/tst_qicon.qrc | 0 tests/auto/{ => gui/image}/qimage/.gitignore | 0 .../{ => gui/image}/qimage/images/image.bmp | Bin .../{ => gui/image}/qimage/images/image.gif | Bin .../{ => gui/image}/qimage/images/image.ico | Bin .../{ => gui/image}/qimage/images/image.jpg | Bin .../{ => gui/image}/qimage/images/image.pbm | 0 .../{ => gui/image}/qimage/images/image.pgm | 0 .../{ => gui/image}/qimage/images/image.png | Bin .../{ => gui/image}/qimage/images/image.ppm | 0 .../{ => gui/image}/qimage/images/image.tif | Bin .../{ => gui/image}/qimage/images/image.xbm | 0 .../{ => gui/image}/qimage/images/image.xpm | 0 tests/auto/{ => gui/image}/qimage/qimage.pro | 0 .../{ => gui/image}/qimage/tst_qimage.cpp | 0 .../image}/qimageiohandler/.gitignore | 0 .../qimageiohandler/qimageiohandler.pro | 0 .../qimageiohandler/tst_qimageiohandler.cpp | 0 .../{ => gui/image}/qimagereader/.gitignore | 0 .../image}/qimagereader/baseline/35floppy.png | Bin .../image}/qimagereader/baseline/connect.png | Bin .../qimagereader/baseline/kde_favicon.png | Bin .../qimagereader/baseline/semitransparent.png | Bin .../image}/qimagereader/images/16bpp.bmp | Bin .../image}/qimagereader/images/4bpp-rle.bmp | Bin .../image}/qimagereader/images/YCbCr_cmyk.jpg | Bin .../image}/qimagereader/images/YCbCr_cmyk.png | Bin .../image}/qimagereader/images/YCbCr_rgb.jpg | Bin .../image}/qimagereader/images/away.png | Bin .../image}/qimagereader/images/ball.mng | Bin .../image}/qimagereader/images/bat1.gif | Bin .../image}/qimagereader/images/bat2.gif | Bin .../image}/qimagereader/images/beavis.jpg | Bin .../image}/qimagereader/images/black.png | Bin .../image}/qimagereader/images/black.xpm | 0 .../image}/qimagereader/images/colorful.bmp | Bin .../qimagereader/images/corrupt-colors.xpm | 0 .../qimagereader/images/corrupt-data.tif | Bin .../images/corrupt-pixel-count.xpm | 0 .../qimagereader/images/corrupt-pixels.xpm | 0 .../image}/qimagereader/images/corrupt.bmp | Bin .../image}/qimagereader/images/corrupt.gif | Bin .../image}/qimagereader/images/corrupt.jpg | Bin .../image}/qimagereader/images/corrupt.mng | Bin .../image}/qimagereader/images/corrupt.png | Bin .../image}/qimagereader/images/corrupt.svg | 0 .../image}/qimagereader/images/corrupt.svgz | Bin .../image}/qimagereader/images/corrupt.xbm | 0 .../qimagereader/images/crash-signed-char.bmp | Bin .../image}/qimagereader/images/earth.gif | Bin .../qimagereader/images/endless-anim.gif | Bin .../image}/qimagereader/images/fire.mng | Bin .../image}/qimagereader/images/font.bmp | Bin .../qimagereader/images/four-frames.gif | Bin .../image}/qimagereader/images/gnus.xbm | 0 .../qimagereader/images/grayscale-ref.tif | Bin .../image}/qimagereader/images/grayscale.tif | Bin .../image}/qimagereader/images/image.pbm | 0 .../image}/qimagereader/images/image.pgm | 0 .../image}/qimagereader/images/image.png | Bin .../image}/qimagereader/images/image.ppm | 0 .../qimagereader/images/image_100dpi.tif | Bin .../image}/qimagereader/images/kollada-noext | Bin .../image}/qimagereader/images/kollada.png | Bin .../image}/qimagereader/images/marble.xpm | 0 .../qimagereader/images/namedcolors.xpm | 0 .../qimagereader/images/negativeheight.bmp | Bin .../qimagereader/images/noclearcode.bmp | Bin .../qimagereader/images/noclearcode.gif | Bin .../qimagereader/images/nontransparent.xpm | 0 .../qimagereader/images/qt-gif-anim.gif | Bin .../qimagereader/images/qt-gif-noanim.gif | Bin .../image}/qimagereader/images/qt.gif | Bin .../image}/qimagereader/images/qt1.gif | Bin .../image}/qimagereader/images/qt2.gif | Bin .../image}/qimagereader/images/qt3.gif | Bin .../image}/qimagereader/images/qt4.gif | Bin .../image}/qimagereader/images/qt5.gif | Bin .../image}/qimagereader/images/qt6.gif | Bin .../image}/qimagereader/images/qt7.gif | Bin .../image}/qimagereader/images/qt8.gif | Bin .../qimagereader/images/qtbug13653-no_eoi.jpg | Bin .../image}/qimagereader/images/rect.svg | 0 .../image}/qimagereader/images/rect.svgz | Bin .../images/rgba_adobedeflate_littleendian.tif | Bin .../images/rgba_lzw_littleendian.tif | Bin .../images/rgba_nocompression_bigendian.tif | Bin .../rgba_nocompression_littleendian.tif | Bin .../images/rgba_packbits_littleendian.tif | Bin .../images/rgba_zipdeflate_littleendian.tif | Bin .../image}/qimagereader/images/runners.ppm | Bin .../image}/qimagereader/images/teapot.ppm | 0 .../image}/qimagereader/images/test.ppm | 0 .../image}/qimagereader/images/test.xpm | 0 .../image}/qimagereader/images/test32bfv4.bmp | Bin .../image}/qimagereader/images/test32v5.bmp | Bin .../tiff_oriented/indexed_orientation_1.tiff | Bin .../tiff_oriented/indexed_orientation_2.tiff | Bin .../tiff_oriented/indexed_orientation_3.tiff | Bin .../tiff_oriented/indexed_orientation_4.tiff | Bin .../tiff_oriented/indexed_orientation_5.tiff | Bin .../tiff_oriented/indexed_orientation_6.tiff | Bin .../tiff_oriented/indexed_orientation_7.tiff | Bin .../tiff_oriented/indexed_orientation_8.tiff | Bin .../tiff_oriented/mono_orientation_1.tiff | Bin .../tiff_oriented/mono_orientation_2.tiff | Bin .../tiff_oriented/mono_orientation_3.tiff | Bin .../tiff_oriented/mono_orientation_4.tiff | Bin .../tiff_oriented/mono_orientation_5.tiff | Bin .../tiff_oriented/mono_orientation_6.tiff | Bin .../tiff_oriented/mono_orientation_7.tiff | Bin .../tiff_oriented/mono_orientation_8.tiff | Bin .../tiff_oriented/original_indexed.tiff | Bin .../images/tiff_oriented/original_mono.tiff | Bin .../images/tiff_oriented/original_rgb.tiff | Bin .../tiff_oriented/rgb_orientation_1.tiff | Bin .../tiff_oriented/rgb_orientation_2.tiff | Bin .../tiff_oriented/rgb_orientation_3.tiff | Bin .../tiff_oriented/rgb_orientation_4.tiff | Bin .../tiff_oriented/rgb_orientation_5.tiff | Bin .../tiff_oriented/rgb_orientation_6.tiff | Bin .../tiff_oriented/rgb_orientation_7.tiff | Bin .../tiff_oriented/rgb_orientation_8.tiff | Bin .../qimagereader/images/transparent.xpm | 0 .../image}/qimagereader/images/trolltech.gif | Bin .../image}/qimagereader/images/tst7.bmp | Bin .../image}/qimagereader/images/tst7.png | Bin .../image}/qimagereader/images/txts.png | Bin .../image}/qimagereader/qimagereader.pro | 0 .../image}/qimagereader/qimagereader.qrc | 0 .../image}/qimagereader/tst_qimagereader.cpp | 2 +- .../{ => gui/image}/qimagewriter/.gitignore | 0 .../image}/qimagewriter/images/YCbCr_cmyk.jpg | Bin .../image}/qimagewriter/images/YCbCr_rgb.jpg | Bin .../image}/qimagewriter/images/beavis.jpg | Bin .../image}/qimagewriter/images/colorful.bmp | Bin .../image}/qimagewriter/images/earth.gif | Bin .../image}/qimagewriter/images/font.bmp | Bin .../image}/qimagewriter/images/gnus.xbm | 0 .../image}/qimagewriter/images/kollada.png | Bin .../image}/qimagewriter/images/marble.xpm | 0 .../image}/qimagewriter/images/ship63.pbm | Bin .../image}/qimagewriter/images/teapot.ppm | 0 .../image}/qimagewriter/images/teapot.tiff | Bin .../image}/qimagewriter/images/trolltech.gif | Bin .../image}/qimagewriter/qimagewriter.pro | 0 .../image}/qimagewriter/tst_qimagewriter.cpp | 0 tests/auto/{ => gui/image}/qmovie/.gitignore | 0 .../image}/qmovie/animations/comicsecard.gif | Bin .../image}/qmovie/animations/corrupt.gif | Bin .../image}/qmovie/animations/dutch.mng | Bin .../image}/qmovie/animations/trolltech.gif | Bin tests/auto/{ => gui/image}/qmovie/qmovie.pro | 0 .../auto/{ => gui/image}/qmovie/resources.qrc | 0 .../{ => gui/image}/qmovie/tst_qmovie.cpp | 0 .../auto/{ => gui/image}/qpicture/.gitignore | 0 .../{ => gui/image}/qpicture/qpicture.pro | 0 .../{ => gui/image}/qpicture/tst_qpicture.cpp | 0 tests/auto/{ => gui/image}/qpixmap/.gitignore | 0 .../convertFromImage/task31722_0/img1.png | Bin .../convertFromImage/task31722_0/img2.png | Bin .../convertFromImage/task31722_1/img1.png | Bin .../convertFromImage/task31722_1/img2.png | Bin .../qpixmap/convertFromToHICON/icon_32bpp.ico | Bin .../convertFromToHICON/icon_32bpp_16x16.png | Bin .../convertFromToHICON/icon_32bpp_256x256.png | Bin .../convertFromToHICON/icon_32bpp_32x32.png | Bin .../convertFromToHICON/icon_32bpp_48x48.png | Bin .../qpixmap/convertFromToHICON/icon_8bpp.ico | Bin .../convertFromToHICON/icon_8bpp_16x16.png | Bin .../convertFromToHICON/icon_8bpp_32x32.png | Bin .../convertFromToHICON/icon_8bpp_48x48.png | Bin .../image}/qpixmap/images/designer.png | Bin .../images/dx_-10_dy_-10_50_50_100_100.png | Bin .../qpixmap/images/dx_-10_dy_-10_x_y_w_h.png | Bin .../images/dx_-10_dy_0_50_50_100_100.png | Bin .../qpixmap/images/dx_-10_dy_0_x_y_w_h.png | Bin .../images/dx_-128_dy_-128_x_y_w_h.png | Bin .../qpixmap/images/dx_-128_dy_0_x_y_w_h.png | Bin .../images/dx_0_dy_-10_50_50_100_100.png | Bin .../qpixmap/images/dx_0_dy_-10_x_y_w_h.png | Bin .../qpixmap/images/dx_0_dy_-128_x_y_w_h.png | Bin .../images/dx_0_dy_0_50_50_100_100.png | Bin .../image}/qpixmap/images/dx_0_dy_0_null.png | Bin .../qpixmap/images/dx_0_dy_0_x_y_w_h.png | Bin .../images/dx_0_dy_10_50_50_100_100.png | Bin .../qpixmap/images/dx_0_dy_10_x_y_w_h.png | Bin .../qpixmap/images/dx_0_dy_128_x_y_w_h.png | Bin .../image}/qpixmap/images/dx_0_dy_1_null.png | Bin .../images/dx_10_dy_0_50_50_100_100.png | Bin .../qpixmap/images/dx_10_dy_0_x_y_w_h.png | Bin .../images/dx_10_dy_10_50_50_100_100.png | Bin .../qpixmap/images/dx_10_dy_10_x_y_w_h.png | Bin .../qpixmap/images/dx_128_dy_0_x_y_w_h.png | Bin .../images/dx_128_dy_128_64_64_128_128.png | Bin .../qpixmap/images/dx_128_dy_128_x_y_w_h.png | Bin .../image}/qpixmap/images/dx_1_dy_0_null.png | Bin .../qpixmap/loadFromData/designer_argb32.png | Bin .../designer_indexed8_no_alpha.gif | Bin .../designer_indexed8_no_alpha.png | Bin .../designer_indexed8_no_alpha_animated.gif | Bin .../designer_indexed8_with_alpha.gif | Bin .../designer_indexed8_with_alpha.png | Bin .../designer_indexed8_with_alpha_animated.gif | Bin .../qpixmap/loadFromData/designer_rgb32.jpg | Bin .../qpixmap/loadFromData/designer_rgb32.png | Bin .../auto/{ => gui/image}/qpixmap/qpixmap.pro | 0 .../auto/{ => gui/image}/qpixmap/qpixmap.qrc | 0 .../{ => gui/image}/qpixmap/tst_qpixmap.cpp | 0 .../{ => gui/image}/qpixmapcache/.gitignore | 0 .../image}/qpixmapcache/qpixmapcache.pro | 0 .../image}/qpixmapcache/tst_qpixmapcache.cpp | 0 .../{ => gui/image}/qpixmapfilter/noise.png | Bin .../image}/qpixmapfilter/qpixmapfilter.pro | 0 .../qpixmapfilter/tst_qpixmapfilter.cpp | 0 .../image}/qvolatileimage/qvolatileimage.pro | 0 .../qvolatileimage/tst_qvolatileimage.cpp | 0 tests/auto/gui/kernel/kernel.pro | 17 +++++ .../{ => gui/kernel}/qclipboard/.gitignore | 0 .../kernel}/qclipboard/copier/copier.pro | 0 .../kernel}/qclipboard/copier/main.cpp | 0 .../kernel}/qclipboard/paster/main.cpp | 0 .../kernel}/qclipboard/paster/paster.pro | 0 .../kernel}/qclipboard/qclipboard.pro | 0 .../{ => gui/kernel}/qclipboard/test/test.pro | 0 .../kernel}/qclipboard/tst_qclipboard.cpp | 0 tests/auto/{ => gui/kernel}/qdrag/.gitignore | 0 tests/auto/{ => gui/kernel}/qdrag/qdrag.pro | 0 .../auto/{ => gui/kernel}/qdrag/tst_qdrag.cpp | 0 tests/auto/{ => gui/kernel}/qevent/.gitignore | 0 tests/auto/{ => gui/kernel}/qevent/qevent.pro | 0 .../{ => gui/kernel}/qevent/tst_qevent.cpp | 0 .../kernel}/qfileopenevent/qfileopenevent.pro | 0 .../qfileopeneventexternal.cpp | 0 .../qfileopeneventexternal.pro | 0 .../kernel}/qfileopenevent/test/test.pro | 0 .../test/tst_qfileopenevent.cpp | 0 .../{ => gui/kernel}/qguivariant/.gitignore | 0 .../kernel}/qguivariant/qguivariant.pro | 0 .../kernel}/qguivariant/tst_qguivariant.cpp | 0 .../{ => gui/kernel}/qkeysequence/.gitignore | 0 .../{ => gui/kernel}/qkeysequence/keys_de.qm | Bin .../{ => gui/kernel}/qkeysequence/keys_de.ts | 0 .../kernel}/qkeysequence/qkeysequence.pro | 0 .../kernel}/qkeysequence/qkeysequence.qrc | 0 .../{ => gui/kernel}/qkeysequence/qt_de.qm | Bin .../kernel}/qkeysequence/tst_qkeysequence.cpp | 0 .../{ => gui/kernel}/qmouseevent/.gitignore | 0 .../kernel}/qmouseevent/qmouseevent.pro | 0 .../kernel}/qmouseevent/tst_qmouseevent.cpp | 0 .../kernel}/qmouseevent_modal/.gitignore | 0 .../qmouseevent_modal/qmouseevent_modal.pro | 0 .../tst_qmouseevent_modal.cpp | 0 .../auto/{ => gui/kernel}/qpalette/.gitignore | 0 .../{ => gui/kernel}/qpalette/qpalette.pro | 0 .../kernel}/qpalette/tst_qpalette.cpp | 0 .../{ => gui/kernel}/qshortcut/.gitignore | 0 .../{ => gui/kernel}/qshortcut/qshortcut.pro | 0 .../kernel}/qshortcut/tst_qshortcut.cpp | 0 .../kernel}/qtouchevent/qtouchevent.pro | 0 .../kernel}/qtouchevent/tst_qtouchevent.cpp | 0 tests/auto/gui/math3d/math3d.pro | 6 ++ .../math3d}/qmatrixnxn/qmatrixnxn.pro | 0 .../math3d}/qmatrixnxn/tst_qmatrixnxn.cpp | 0 .../math3d}/qquaternion/qquaternion.pro | 0 .../math3d}/qquaternion/tst_qquaternion.cpp | 0 .../{ => gui/math3d}/qvectornd/qvectornd.pro | 0 .../math3d}/qvectornd/tst_qvectornd.cpp | 0 tests/auto/gui/painting/painting.pro | 21 ++++++ .../auto/{ => gui/painting}/qbrush/.gitignore | 0 .../auto/{ => gui/painting}/qbrush/qbrush.pro | 0 .../{ => gui/painting}/qbrush/tst_qbrush.cpp | 0 .../auto/{ => gui/painting}/qcolor/.gitignore | 0 .../auto/{ => gui/painting}/qcolor/qcolor.pro | 0 .../{ => gui/painting}/qcolor/tst_qcolor.cpp | 0 .../painting}/qpaintengine/.gitignore | 0 .../painting}/qpaintengine/qpaintengine.pro | 0 .../qpaintengine/tst_qpaintengine.cpp | 0 .../{ => gui/painting}/qpainter/.gitignore | 0 .../qpainter/drawEllipse/10x10SizeAt0x0.png | Bin .../drawEllipse/10x10SizeAt100x100.png | Bin .../drawEllipse/10x10SizeAt200x200.png | Bin .../qpainter/drawEllipse/13x100SizeAt0x0.png | Bin .../drawEllipse/13x100SizeAt100x100.png | Bin .../drawEllipse/13x100SizeAt200x200.png | Bin .../qpainter/drawEllipse/200x200SizeAt0x0.png | Bin .../drawEllipse/200x200SizeAt100x100.png | Bin .../drawEllipse/200x200SizeAt200x200.png | Bin .../qpainter/drawLine_rop_bitmap/dst.xbm | 0 .../drawLine_rop_bitmap/res/res_AndNotROP.xbm | 0 .../drawLine_rop_bitmap/res/res_AndROP.xbm | 0 .../drawLine_rop_bitmap/res/res_ClearROP.xbm | 0 .../drawLine_rop_bitmap/res/res_CopyROP.xbm | 0 .../drawLine_rop_bitmap/res/res_NandROP.xbm | 0 .../drawLine_rop_bitmap/res/res_NopROP.xbm | 0 .../drawLine_rop_bitmap/res/res_NorROP.xbm | 0 .../drawLine_rop_bitmap/res/res_NotAndROP.xbm | 0 .../res/res_NotCopyROP.xbm | 0 .../drawLine_rop_bitmap/res/res_NotOrROP.xbm | 0 .../drawLine_rop_bitmap/res/res_NotROP.xbm | 0 .../drawLine_rop_bitmap/res/res_NotXorROP.xbm | 0 .../drawLine_rop_bitmap/res/res_OrNotROP.xbm | 0 .../drawLine_rop_bitmap/res/res_OrROP.xbm | 0 .../drawLine_rop_bitmap/res/res_SetROP.xbm | 0 .../drawLine_rop_bitmap/res/res_XorROP.xbm | 0 .../qpainter/drawPixmap_rop/dst1.png | Bin .../qpainter/drawPixmap_rop/dst2.png | Bin .../qpainter/drawPixmap_rop/dst3.png | Bin .../drawPixmap_rop/res/res_AndNotROP0.png | Bin .../drawPixmap_rop/res/res_AndNotROP1.png | Bin .../drawPixmap_rop/res/res_AndNotROP2.png | Bin .../drawPixmap_rop/res/res_AndNotROP3.png | Bin .../drawPixmap_rop/res/res_AndNotROP4.png | Bin .../drawPixmap_rop/res/res_AndNotROP5.png | Bin .../drawPixmap_rop/res/res_AndNotROP6.png | Bin .../drawPixmap_rop/res/res_AndNotROP7.png | Bin .../drawPixmap_rop/res/res_AndROP0.png | Bin .../drawPixmap_rop/res/res_AndROP1.png | Bin .../drawPixmap_rop/res/res_AndROP2.png | Bin .../drawPixmap_rop/res/res_AndROP3.png | Bin .../drawPixmap_rop/res/res_AndROP4.png | Bin .../drawPixmap_rop/res/res_AndROP5.png | Bin .../drawPixmap_rop/res/res_AndROP6.png | Bin .../drawPixmap_rop/res/res_AndROP7.png | Bin .../drawPixmap_rop/res/res_ClearROP0.png | Bin .../drawPixmap_rop/res/res_ClearROP1.png | Bin .../drawPixmap_rop/res/res_ClearROP2.png | Bin .../drawPixmap_rop/res/res_ClearROP3.png | Bin .../drawPixmap_rop/res/res_ClearROP4.png | Bin .../drawPixmap_rop/res/res_ClearROP5.png | Bin .../drawPixmap_rop/res/res_ClearROP6.png | Bin .../drawPixmap_rop/res/res_ClearROP7.png | Bin .../drawPixmap_rop/res/res_CopyROP0.png | Bin .../drawPixmap_rop/res/res_CopyROP1.png | Bin .../drawPixmap_rop/res/res_CopyROP2.png | Bin .../drawPixmap_rop/res/res_CopyROP3.png | Bin .../drawPixmap_rop/res/res_CopyROP4.png | Bin .../drawPixmap_rop/res/res_CopyROP5.png | Bin .../drawPixmap_rop/res/res_CopyROP6.png | Bin .../drawPixmap_rop/res/res_CopyROP7.png | Bin .../drawPixmap_rop/res/res_NandROP0.png | Bin .../drawPixmap_rop/res/res_NandROP1.png | Bin .../drawPixmap_rop/res/res_NandROP2.png | Bin .../drawPixmap_rop/res/res_NandROP3.png | Bin .../drawPixmap_rop/res/res_NandROP4.png | Bin .../drawPixmap_rop/res/res_NandROP5.png | Bin .../drawPixmap_rop/res/res_NandROP6.png | Bin .../drawPixmap_rop/res/res_NandROP7.png | Bin .../drawPixmap_rop/res/res_NopROP0.png | Bin .../drawPixmap_rop/res/res_NopROP1.png | Bin .../drawPixmap_rop/res/res_NopROP2.png | Bin .../drawPixmap_rop/res/res_NopROP3.png | Bin .../drawPixmap_rop/res/res_NopROP4.png | Bin .../drawPixmap_rop/res/res_NopROP5.png | Bin .../drawPixmap_rop/res/res_NopROP6.png | Bin .../drawPixmap_rop/res/res_NopROP7.png | Bin .../drawPixmap_rop/res/res_NorROP0.png | Bin .../drawPixmap_rop/res/res_NorROP1.png | Bin .../drawPixmap_rop/res/res_NorROP2.png | Bin .../drawPixmap_rop/res/res_NorROP3.png | Bin .../drawPixmap_rop/res/res_NorROP4.png | Bin .../drawPixmap_rop/res/res_NorROP5.png | Bin .../drawPixmap_rop/res/res_NorROP6.png | Bin .../drawPixmap_rop/res/res_NorROP7.png | Bin .../drawPixmap_rop/res/res_NotAndROP0.png | Bin .../drawPixmap_rop/res/res_NotAndROP1.png | Bin .../drawPixmap_rop/res/res_NotAndROP2.png | Bin .../drawPixmap_rop/res/res_NotAndROP3.png | Bin .../drawPixmap_rop/res/res_NotAndROP4.png | Bin .../drawPixmap_rop/res/res_NotAndROP5.png | Bin .../drawPixmap_rop/res/res_NotAndROP6.png | Bin .../drawPixmap_rop/res/res_NotAndROP7.png | Bin .../drawPixmap_rop/res/res_NotCopyROP0.png | Bin .../drawPixmap_rop/res/res_NotCopyROP1.png | Bin .../drawPixmap_rop/res/res_NotCopyROP2.png | Bin .../drawPixmap_rop/res/res_NotCopyROP3.png | Bin .../drawPixmap_rop/res/res_NotCopyROP4.png | Bin .../drawPixmap_rop/res/res_NotCopyROP5.png | Bin .../drawPixmap_rop/res/res_NotCopyROP6.png | Bin .../drawPixmap_rop/res/res_NotCopyROP7.png | Bin .../drawPixmap_rop/res/res_NotOrROP0.png | Bin .../drawPixmap_rop/res/res_NotOrROP1.png | Bin .../drawPixmap_rop/res/res_NotOrROP2.png | Bin .../drawPixmap_rop/res/res_NotOrROP3.png | Bin .../drawPixmap_rop/res/res_NotOrROP4.png | Bin .../drawPixmap_rop/res/res_NotOrROP5.png | Bin .../drawPixmap_rop/res/res_NotOrROP6.png | Bin .../drawPixmap_rop/res/res_NotOrROP7.png | Bin .../drawPixmap_rop/res/res_NotROP0.png | Bin .../drawPixmap_rop/res/res_NotROP1.png | Bin .../drawPixmap_rop/res/res_NotROP2.png | Bin .../drawPixmap_rop/res/res_NotROP3.png | Bin .../drawPixmap_rop/res/res_NotROP4.png | Bin .../drawPixmap_rop/res/res_NotROP5.png | Bin .../drawPixmap_rop/res/res_NotROP6.png | Bin .../drawPixmap_rop/res/res_NotROP7.png | Bin .../drawPixmap_rop/res/res_NotXorROP0.png | Bin .../drawPixmap_rop/res/res_NotXorROP1.png | Bin .../drawPixmap_rop/res/res_NotXorROP2.png | Bin .../drawPixmap_rop/res/res_NotXorROP3.png | Bin .../drawPixmap_rop/res/res_NotXorROP4.png | Bin .../drawPixmap_rop/res/res_NotXorROP5.png | Bin .../drawPixmap_rop/res/res_NotXorROP6.png | Bin .../drawPixmap_rop/res/res_NotXorROP7.png | Bin .../drawPixmap_rop/res/res_OrNotROP0.png | Bin .../drawPixmap_rop/res/res_OrNotROP1.png | Bin .../drawPixmap_rop/res/res_OrNotROP2.png | Bin .../drawPixmap_rop/res/res_OrNotROP3.png | Bin .../drawPixmap_rop/res/res_OrNotROP4.png | Bin .../drawPixmap_rop/res/res_OrNotROP5.png | Bin .../drawPixmap_rop/res/res_OrNotROP6.png | Bin .../drawPixmap_rop/res/res_OrNotROP7.png | Bin .../drawPixmap_rop/res/res_OrROP0.png | Bin .../drawPixmap_rop/res/res_OrROP1.png | Bin .../drawPixmap_rop/res/res_OrROP2.png | Bin .../drawPixmap_rop/res/res_OrROP3.png | Bin .../drawPixmap_rop/res/res_OrROP4.png | Bin .../drawPixmap_rop/res/res_OrROP5.png | Bin .../drawPixmap_rop/res/res_OrROP6.png | Bin .../drawPixmap_rop/res/res_OrROP7.png | Bin .../drawPixmap_rop/res/res_SetROP0.png | Bin .../drawPixmap_rop/res/res_SetROP1.png | Bin .../drawPixmap_rop/res/res_SetROP2.png | Bin .../drawPixmap_rop/res/res_SetROP3.png | Bin .../drawPixmap_rop/res/res_SetROP4.png | Bin .../drawPixmap_rop/res/res_SetROP5.png | Bin .../drawPixmap_rop/res/res_SetROP6.png | Bin .../drawPixmap_rop/res/res_SetROP7.png | Bin .../drawPixmap_rop/res/res_XorROP0.png | Bin .../drawPixmap_rop/res/res_XorROP1.png | Bin .../drawPixmap_rop/res/res_XorROP2.png | Bin .../drawPixmap_rop/res/res_XorROP3.png | Bin .../drawPixmap_rop/res/res_XorROP4.png | Bin .../drawPixmap_rop/res/res_XorROP5.png | Bin .../drawPixmap_rop/res/res_XorROP6.png | Bin .../drawPixmap_rop/res/res_XorROP7.png | Bin .../qpainter/drawPixmap_rop/src1.xbm | 0 .../qpainter/drawPixmap_rop/src2-mask.xbm | 0 .../qpainter/drawPixmap_rop/src2.xbm | 0 .../qpainter/drawPixmap_rop/src3.xbm | 0 .../qpainter/drawPixmap_rop_bitmap/dst.xbm | 0 .../res/res_AndNotROP.xbm | 0 .../drawPixmap_rop_bitmap/res/res_AndROP.xbm | 0 .../res/res_ClearROP.xbm | 0 .../drawPixmap_rop_bitmap/res/res_CopyROP.xbm | 0 .../drawPixmap_rop_bitmap/res/res_NandROP.xbm | 0 .../drawPixmap_rop_bitmap/res/res_NopROP.xbm | 0 .../drawPixmap_rop_bitmap/res/res_NorROP.xbm | 0 .../res/res_NotAndROP.xbm | 0 .../res/res_NotCopyROP.xbm | 0 .../res/res_NotOrROP.xbm | 0 .../drawPixmap_rop_bitmap/res/res_NotROP.xbm | 0 .../res/res_NotXorROP.xbm | 0 .../res/res_OrNotROP.xbm | 0 .../drawPixmap_rop_bitmap/res/res_OrROP.xbm | 0 .../drawPixmap_rop_bitmap/res/res_SetROP.xbm | 0 .../drawPixmap_rop_bitmap/res/res_XorROP.xbm | 0 .../drawPixmap_rop_bitmap/src1-mask.xbm | 0 .../qpainter/drawPixmap_rop_bitmap/src1.xbm | 0 .../qpainter/drawPixmap_rop_bitmap/src2.xbm | 0 .../{ => gui/painting}/qpainter/qpainter.pro | 0 .../painting}/qpainter/task217400.png | Bin .../painting}/qpainter/tst_qpainter.cpp | 2 +- .../utils/createImages/createImages.pro | 0 .../qpainter/utils/createImages/main.cpp | 0 .../painting}/qpainterpath/.gitignore | 0 .../painting}/qpainterpath/qpainterpath.pro | 0 .../qpainterpath/tst_qpainterpath.cpp | 0 .../painting}/qpainterpathstroker/.gitignore | 0 .../qpainterpathstroker.pro | 0 .../tst_qpainterpathstroker.cpp | 0 .../painting}/qpathclipper/.gitignore | 0 .../painting}/qpathclipper/pathcompare.h | 0 .../{ => gui/painting}/qpathclipper/paths.cpp | 0 .../{ => gui/painting}/qpathclipper/paths.h | 0 .../painting}/qpathclipper/qpathclipper.pro | 0 .../qpathclipper/tst_qpathclipper.cpp | 0 tests/auto/{ => gui/painting}/qpen/.gitignore | 0 tests/auto/{ => gui/painting}/qpen/qpen.pro | 0 .../auto/{ => gui/painting}/qpen/tst_qpen.cpp | 0 .../{ => gui/painting}/qpolygon/.gitignore | 0 .../{ => gui/painting}/qpolygon/qpolygon.pro | 0 .../painting}/qpolygon/tst_qpolygon.cpp | 0 .../{ => gui/painting}/qprinter/.gitignore | 0 .../{ => gui/painting}/qprinter/qprinter.pro | 0 .../painting}/qprinter/tst_qprinter.cpp | 0 .../painting}/qprinterinfo/.gitignore | 0 .../painting}/qprinterinfo/qprinterinfo.pro | 0 .../qprinterinfo/tst_qprinterinfo.cpp | 0 .../{ => gui/painting}/qregion/.gitignore | 0 .../{ => gui/painting}/qregion/qregion.pro | 0 .../painting}/qregion/tst_qregion.cpp | 0 .../{ => gui/painting}/qtransform/.gitignore | 0 .../painting}/qtransform/qtransform.pro | 0 .../painting}/qtransform/tst_qtransform.cpp | 0 .../{ => gui/painting}/qwmatrix/.gitignore | 0 .../{ => gui/painting}/qwmatrix/qwmatrix.pro | 0 .../painting}/qwmatrix/tst_qwmatrix.cpp | 0 .../qabstracttextdocumentlayout/.gitignore | 0 .../qabstracttextdocumentlayout.pro | 0 .../tst_qabstracttextdocumentlayout.cpp | 0 .../auto/{ => gui/text}/qcssparser/.gitignore | 0 .../{ => gui/text}/qcssparser/qcssparser.pro | 0 .../testdata/scanner/comments/input | 0 .../testdata/scanner/comments/output | 0 .../testdata/scanner/comments2/input | 0 .../testdata/scanner/comments2/output | 0 .../testdata/scanner/comments3/input | 0 .../testdata/scanner/comments3/output | 0 .../testdata/scanner/comments4/input | 0 .../testdata/scanner/comments4/output | 0 .../testdata/scanner/quotedstring/input | 0 .../testdata/scanner/quotedstring/output | 0 .../qcssparser/testdata/scanner/simple/input | 0 .../qcssparser/testdata/scanner/simple/output | 0 .../qcssparser/testdata/scanner/unicode/input | 0 .../testdata/scanner/unicode/output | 0 .../text}/qcssparser/tst_qcssparser.cpp | 0 tests/auto/{ => gui/text}/qfont/.gitignore | 0 tests/auto/{ => gui/text}/qfont/qfont.pro | 0 tests/auto/{ => gui/text}/qfont/tst_qfont.cpp | 0 .../{ => gui/text}/qfontdatabase/.gitignore | 0 .../{ => gui/text}/qfontdatabase/FreeMono.ttf | Bin .../text}/qfontdatabase/qfontdatabase.pro | 0 .../text}/qfontdatabase/tst_qfontdatabase.cpp | 0 .../{ => gui/text}/qfontmetrics/.gitignore | 0 .../text}/qfontmetrics/qfontmetrics.pro | 0 .../{ => gui/text}/qfontmetrics/testfont.qrc | 0 .../text}/qfontmetrics/tst_qfontmetrics.cpp | 0 .../{ => gui/text}/qfontmetrics/ucs4font.ttf | Bin .../{ => gui/text}/qglyphrun/qglyphrun.pro | 0 tests/auto/{ => gui/text}/qglyphrun/test.ttf | Bin .../text}/qglyphrun/tst_qglyphrun.cpp | 0 .../auto/{ => gui/text}/qrawfont/qrawfont.pro | 0 .../auto/{ => gui/text}/qrawfont/testfont.ttf | Bin .../text}/qrawfont/testfont_bold_italic.ttf | Bin .../{ => gui/text}/qrawfont/tst_qrawfont.cpp | 0 .../text}/qstatictext/qstatictext.pro | 0 .../text}/qstatictext/tst_qstatictext.cpp | 0 .../text}/qsyntaxhighlighter/.gitignore | 0 .../qsyntaxhighlighter/qsyntaxhighlighter.pro | 0 .../tst_qsyntaxhighlighter.cpp | 0 .../auto/{ => gui/text}/qtextblock/.gitignore | 0 .../{ => gui/text}/qtextblock/qtextblock.pro | 0 .../text}/qtextblock/tst_qtextblock.cpp | 0 .../{ => gui/text}/qtextcursor/.gitignore | 0 .../text}/qtextcursor/qtextcursor.pro | 0 .../text}/qtextcursor/tst_qtextcursor.cpp | 0 .../{ => gui/text}/qtextdocument/.gitignore | 0 .../{ => gui/text}/qtextdocument/common.h | 0 .../text}/qtextdocument/qtextdocument.pro | 0 .../text}/qtextdocument/tst_qtextdocument.cpp | 0 .../text}/qtextdocumentfragment/.gitignore | 0 .../qtextdocumentfragment.pro | 0 .../tst_qtextdocumentfragment.cpp | 0 .../text}/qtextdocumentlayout/.gitignore | 0 .../qtextdocumentlayout.pro | 0 .../tst_qtextdocumentlayout.cpp | 0 .../{ => gui/text}/qtextformat/.gitignore | 0 .../text}/qtextformat/qtextformat.pro | 0 .../text}/qtextformat/tst_qtextformat.cpp | 0 .../{ => gui/text}/qtextlayout/.gitignore | 0 .../text}/qtextlayout/qtextlayout.pro | 0 .../text}/qtextlayout/tst_qtextlayout.cpp | 0 .../auto/{ => gui/text}/qtextlist/.gitignore | 0 .../{ => gui/text}/qtextlist/qtextlist.pro | 0 .../text}/qtextlist/tst_qtextlist.cpp | 0 .../{ => gui/text}/qtextobject/.gitignore | 0 .../text}/qtextobject/qtextobject.pro | 0 .../text}/qtextobject/tst_qtextobject.cpp | 0 .../{ => gui/text}/qtextodfwriter/.gitignore | 0 .../text}/qtextodfwriter/qtextodfwriter.pro | 1 + .../qtextodfwriter/tst_qtextodfwriter.cpp | 0 .../{ => gui/text}/qtextpiecetable/.gitignore | 0 .../text}/qtextpiecetable/qtextpiecetable.pro | 0 .../qtextpiecetable/tst_qtextpiecetable.cpp | 0 .../text}/qtextscriptengine/.gitignore | 0 .../qtextscriptengine/generate/generate.pro | 0 .../text}/qtextscriptengine/generate/main.cpp | 0 .../qtextscriptengine/qtextscriptengine.pro | 0 .../tst_qtextscriptengine.cpp | 0 .../auto/{ => gui/text}/qtexttable/.gitignore | 0 .../{ => gui/text}/qtexttable/qtexttable.pro | 0 .../text}/qtexttable/tst_qtexttable.cpp | 0 tests/auto/{ => gui/text}/qzip/.gitignore | 0 tests/auto/{ => gui/text}/qzip/qzip.pro | 1 + .../{ => gui/text}/qzip/testdata/symlink.zip | Bin .../{ => gui/text}/qzip/testdata/test.zip | Bin tests/auto/{ => gui/text}/qzip/tst_qzip.cpp | 0 tests/auto/gui/text/text.pro | 32 ++++++++++ .../util}/qdesktopservices/.gitignore | 0 .../qdesktopservices/qdesktopservices.pro | 0 .../qdesktopservices/tst_qdesktopservices.cpp | 0 tests/auto/gui/util/util.pro | 4 ++ tests/auto/other.pro | 10 --- tests/auto/qgl/qgl.qrc | 2 +- .../qgraphicsscene/tst_qgraphicsscene.cpp | 2 +- 640 files changed, 114 insertions(+), 74 deletions(-) create mode 100644 tests/auto/gui/gui.pro create mode 100644 tests/auto/gui/image/image.pro rename tests/auto/{ => gui/image}/qicoimageformat/.gitignore (100%) rename tests/auto/{ => gui/image}/qicoimageformat/icons/invalid/35floppy.ico (100%) rename tests/auto/{ => gui/image}/qicoimageformat/icons/valid/35FLOPPY.ICO (100%) rename tests/auto/{ => gui/image}/qicoimageformat/icons/valid/AddPerfMon.ico (100%) rename tests/auto/{ => gui/image}/qicoimageformat/icons/valid/App.ico (100%) rename tests/auto/{ => gui/image}/qicoimageformat/icons/valid/Obj_N2_Internal_Mem.ico (100%) rename tests/auto/{ => gui/image}/qicoimageformat/icons/valid/Qt.ico (100%) rename tests/auto/{ => gui/image}/qicoimageformat/icons/valid/Status_Play.ico (100%) rename tests/auto/{ => gui/image}/qicoimageformat/icons/valid/TIMER01.ICO (100%) rename tests/auto/{ => gui/image}/qicoimageformat/icons/valid/WORLD.ico (100%) rename tests/auto/{ => gui/image}/qicoimageformat/icons/valid/WORLDH.ico (100%) rename tests/auto/{ => gui/image}/qicoimageformat/icons/valid/abcardWindow.ico (100%) rename tests/auto/{ => gui/image}/qicoimageformat/icons/valid/semitransparent.ico (100%) rename tests/auto/{ => gui/image}/qicoimageformat/icons/valid/trolltechlogo_tiny.ico (100%) rename tests/auto/{ => gui/image}/qicoimageformat/qicoimageformat.pro (100%) rename tests/auto/{ => gui/image}/qicoimageformat/tst_qicoimageformat.cpp (100%) rename tests/auto/{ => gui/image}/qicon/.gitignore (100%) rename tests/auto/{ => gui/image}/qicon/heart.svg (100%) rename tests/auto/{ => gui/image}/qicon/heart.svgz (100%) rename tests/auto/{ => gui/image}/qicon/icons/testtheme/16x16/actions/appointment-new.png (100%) rename tests/auto/{ => gui/image}/qicon/icons/testtheme/22x22/actions/appointment-new.png (100%) rename tests/auto/{ => gui/image}/qicon/icons/testtheme/32x32/actions/appointment-new.png (100%) rename tests/auto/{ => gui/image}/qicon/icons/testtheme/index.theme (100%) rename tests/auto/{ => gui/image}/qicon/icons/testtheme/scalable/actions/svg-only.svg (100%) rename tests/auto/{ => gui/image}/qicon/icons/themeparent/16x16/actions/address-book-new.png (100%) rename tests/auto/{ => gui/image}/qicon/icons/themeparent/16x16/actions/appointment-new.png (100%) rename tests/auto/{ => gui/image}/qicon/icons/themeparent/22x22/actions/address-book-new.png (100%) rename tests/auto/{ => gui/image}/qicon/icons/themeparent/22x22/actions/appointment-new.png (100%) rename tests/auto/{ => gui/image}/qicon/icons/themeparent/32x32/actions/address-book-new.png (100%) rename tests/auto/{ => gui/image}/qicon/icons/themeparent/32x32/actions/appointment-new.png (100%) rename tests/auto/{ => gui/image}/qicon/icons/themeparent/index.theme (100%) rename tests/auto/{ => gui/image}/qicon/icons/themeparent/scalable/actions/address-book-new.svg (100%) rename tests/auto/{ => gui/image}/qicon/icons/themeparent/scalable/actions/appointment-new.svg (100%) rename tests/auto/{ => gui/image}/qicon/image.png (100%) rename tests/auto/{ => gui/image}/qicon/qicon.pro (100%) rename tests/auto/{ => gui/image}/qicon/rect.png (100%) rename tests/auto/{ => gui/image}/qicon/rect.svg (100%) rename tests/auto/{ => gui/image}/qicon/trash.svg (100%) rename tests/auto/{ => gui/image}/qicon/tst_qicon.cpp (100%) rename tests/auto/{ => gui/image}/qicon/tst_qicon.qrc (100%) rename tests/auto/{ => gui/image}/qimage/.gitignore (100%) rename tests/auto/{ => gui/image}/qimage/images/image.bmp (100%) rename tests/auto/{ => gui/image}/qimage/images/image.gif (100%) rename tests/auto/{ => gui/image}/qimage/images/image.ico (100%) rename tests/auto/{ => gui/image}/qimage/images/image.jpg (100%) rename tests/auto/{ => gui/image}/qimage/images/image.pbm (100%) rename tests/auto/{ => gui/image}/qimage/images/image.pgm (100%) rename tests/auto/{ => gui/image}/qimage/images/image.png (100%) rename tests/auto/{ => gui/image}/qimage/images/image.ppm (100%) rename tests/auto/{ => gui/image}/qimage/images/image.tif (100%) rename tests/auto/{ => gui/image}/qimage/images/image.xbm (100%) rename tests/auto/{ => gui/image}/qimage/images/image.xpm (100%) rename tests/auto/{ => gui/image}/qimage/qimage.pro (100%) rename tests/auto/{ => gui/image}/qimage/tst_qimage.cpp (100%) rename tests/auto/{ => gui/image}/qimageiohandler/.gitignore (100%) rename tests/auto/{ => gui/image}/qimageiohandler/qimageiohandler.pro (100%) rename tests/auto/{ => gui/image}/qimageiohandler/tst_qimageiohandler.cpp (100%) rename tests/auto/{ => gui/image}/qimagereader/.gitignore (100%) rename tests/auto/{ => gui/image}/qimagereader/baseline/35floppy.png (100%) rename tests/auto/{ => gui/image}/qimagereader/baseline/connect.png (100%) rename tests/auto/{ => gui/image}/qimagereader/baseline/kde_favicon.png (100%) rename tests/auto/{ => gui/image}/qimagereader/baseline/semitransparent.png (100%) rename tests/auto/{ => gui/image}/qimagereader/images/16bpp.bmp (100%) rename tests/auto/{ => gui/image}/qimagereader/images/4bpp-rle.bmp (100%) rename tests/auto/{ => gui/image}/qimagereader/images/YCbCr_cmyk.jpg (100%) rename tests/auto/{ => gui/image}/qimagereader/images/YCbCr_cmyk.png (100%) rename tests/auto/{ => gui/image}/qimagereader/images/YCbCr_rgb.jpg (100%) rename tests/auto/{ => gui/image}/qimagereader/images/away.png (100%) rename tests/auto/{ => gui/image}/qimagereader/images/ball.mng (100%) rename tests/auto/{ => gui/image}/qimagereader/images/bat1.gif (100%) rename tests/auto/{ => gui/image}/qimagereader/images/bat2.gif (100%) rename tests/auto/{ => gui/image}/qimagereader/images/beavis.jpg (100%) rename tests/auto/{ => gui/image}/qimagereader/images/black.png (100%) rename tests/auto/{ => gui/image}/qimagereader/images/black.xpm (100%) rename tests/auto/{ => gui/image}/qimagereader/images/colorful.bmp (100%) rename tests/auto/{ => gui/image}/qimagereader/images/corrupt-colors.xpm (100%) rename tests/auto/{ => gui/image}/qimagereader/images/corrupt-data.tif (100%) rename tests/auto/{ => gui/image}/qimagereader/images/corrupt-pixel-count.xpm (100%) rename tests/auto/{ => gui/image}/qimagereader/images/corrupt-pixels.xpm (100%) rename tests/auto/{ => gui/image}/qimagereader/images/corrupt.bmp (100%) rename tests/auto/{ => gui/image}/qimagereader/images/corrupt.gif (100%) rename tests/auto/{ => gui/image}/qimagereader/images/corrupt.jpg (100%) rename tests/auto/{ => gui/image}/qimagereader/images/corrupt.mng (100%) rename tests/auto/{ => gui/image}/qimagereader/images/corrupt.png (100%) rename tests/auto/{ => gui/image}/qimagereader/images/corrupt.svg (100%) rename tests/auto/{ => gui/image}/qimagereader/images/corrupt.svgz (100%) rename tests/auto/{ => gui/image}/qimagereader/images/corrupt.xbm (100%) rename tests/auto/{ => gui/image}/qimagereader/images/crash-signed-char.bmp (100%) rename tests/auto/{ => gui/image}/qimagereader/images/earth.gif (100%) rename tests/auto/{ => gui/image}/qimagereader/images/endless-anim.gif (100%) rename tests/auto/{ => gui/image}/qimagereader/images/fire.mng (100%) rename tests/auto/{ => gui/image}/qimagereader/images/font.bmp (100%) rename tests/auto/{ => gui/image}/qimagereader/images/four-frames.gif (100%) rename tests/auto/{ => gui/image}/qimagereader/images/gnus.xbm (100%) rename tests/auto/{ => gui/image}/qimagereader/images/grayscale-ref.tif (100%) rename tests/auto/{ => gui/image}/qimagereader/images/grayscale.tif (100%) rename tests/auto/{ => gui/image}/qimagereader/images/image.pbm (100%) rename tests/auto/{ => gui/image}/qimagereader/images/image.pgm (100%) rename tests/auto/{ => gui/image}/qimagereader/images/image.png (100%) rename tests/auto/{ => gui/image}/qimagereader/images/image.ppm (100%) rename tests/auto/{ => gui/image}/qimagereader/images/image_100dpi.tif (100%) rename tests/auto/{ => gui/image}/qimagereader/images/kollada-noext (100%) rename tests/auto/{ => gui/image}/qimagereader/images/kollada.png (100%) rename tests/auto/{ => gui/image}/qimagereader/images/marble.xpm (100%) rename tests/auto/{ => gui/image}/qimagereader/images/namedcolors.xpm (100%) rename tests/auto/{ => gui/image}/qimagereader/images/negativeheight.bmp (100%) rename tests/auto/{ => gui/image}/qimagereader/images/noclearcode.bmp (100%) rename tests/auto/{ => gui/image}/qimagereader/images/noclearcode.gif (100%) rename tests/auto/{ => gui/image}/qimagereader/images/nontransparent.xpm (100%) rename tests/auto/{ => gui/image}/qimagereader/images/qt-gif-anim.gif (100%) rename tests/auto/{ => gui/image}/qimagereader/images/qt-gif-noanim.gif (100%) rename tests/auto/{ => gui/image}/qimagereader/images/qt.gif (100%) rename tests/auto/{ => gui/image}/qimagereader/images/qt1.gif (100%) rename tests/auto/{ => gui/image}/qimagereader/images/qt2.gif (100%) rename tests/auto/{ => gui/image}/qimagereader/images/qt3.gif (100%) rename tests/auto/{ => gui/image}/qimagereader/images/qt4.gif (100%) rename tests/auto/{ => gui/image}/qimagereader/images/qt5.gif (100%) rename tests/auto/{ => gui/image}/qimagereader/images/qt6.gif (100%) rename tests/auto/{ => gui/image}/qimagereader/images/qt7.gif (100%) rename tests/auto/{ => gui/image}/qimagereader/images/qt8.gif (100%) rename tests/auto/{ => gui/image}/qimagereader/images/qtbug13653-no_eoi.jpg (100%) rename tests/auto/{ => gui/image}/qimagereader/images/rect.svg (100%) rename tests/auto/{ => gui/image}/qimagereader/images/rect.svgz (100%) rename tests/auto/{ => gui/image}/qimagereader/images/rgba_adobedeflate_littleendian.tif (100%) rename tests/auto/{ => gui/image}/qimagereader/images/rgba_lzw_littleendian.tif (100%) rename tests/auto/{ => gui/image}/qimagereader/images/rgba_nocompression_bigendian.tif (100%) rename tests/auto/{ => gui/image}/qimagereader/images/rgba_nocompression_littleendian.tif (100%) rename tests/auto/{ => gui/image}/qimagereader/images/rgba_packbits_littleendian.tif (100%) rename tests/auto/{ => gui/image}/qimagereader/images/rgba_zipdeflate_littleendian.tif (100%) rename tests/auto/{ => gui/image}/qimagereader/images/runners.ppm (100%) rename tests/auto/{ => gui/image}/qimagereader/images/teapot.ppm (100%) rename tests/auto/{ => gui/image}/qimagereader/images/test.ppm (100%) rename tests/auto/{ => gui/image}/qimagereader/images/test.xpm (100%) rename tests/auto/{ => gui/image}/qimagereader/images/test32bfv4.bmp (100%) rename tests/auto/{ => gui/image}/qimagereader/images/test32v5.bmp (100%) rename tests/auto/{ => gui/image}/qimagereader/images/tiff_oriented/indexed_orientation_1.tiff (100%) rename tests/auto/{ => gui/image}/qimagereader/images/tiff_oriented/indexed_orientation_2.tiff (100%) rename tests/auto/{ => gui/image}/qimagereader/images/tiff_oriented/indexed_orientation_3.tiff (100%) rename tests/auto/{ => gui/image}/qimagereader/images/tiff_oriented/indexed_orientation_4.tiff (100%) rename tests/auto/{ => gui/image}/qimagereader/images/tiff_oriented/indexed_orientation_5.tiff (100%) rename tests/auto/{ => gui/image}/qimagereader/images/tiff_oriented/indexed_orientation_6.tiff (100%) rename tests/auto/{ => gui/image}/qimagereader/images/tiff_oriented/indexed_orientation_7.tiff (100%) rename tests/auto/{ => gui/image}/qimagereader/images/tiff_oriented/indexed_orientation_8.tiff (100%) rename tests/auto/{ => gui/image}/qimagereader/images/tiff_oriented/mono_orientation_1.tiff (100%) rename tests/auto/{ => gui/image}/qimagereader/images/tiff_oriented/mono_orientation_2.tiff (100%) rename tests/auto/{ => gui/image}/qimagereader/images/tiff_oriented/mono_orientation_3.tiff (100%) rename tests/auto/{ => gui/image}/qimagereader/images/tiff_oriented/mono_orientation_4.tiff (100%) rename tests/auto/{ => gui/image}/qimagereader/images/tiff_oriented/mono_orientation_5.tiff (100%) rename tests/auto/{ => gui/image}/qimagereader/images/tiff_oriented/mono_orientation_6.tiff (100%) rename tests/auto/{ => gui/image}/qimagereader/images/tiff_oriented/mono_orientation_7.tiff (100%) rename tests/auto/{ => gui/image}/qimagereader/images/tiff_oriented/mono_orientation_8.tiff (100%) rename tests/auto/{ => gui/image}/qimagereader/images/tiff_oriented/original_indexed.tiff (100%) rename tests/auto/{ => gui/image}/qimagereader/images/tiff_oriented/original_mono.tiff (100%) rename tests/auto/{ => gui/image}/qimagereader/images/tiff_oriented/original_rgb.tiff (100%) rename tests/auto/{ => gui/image}/qimagereader/images/tiff_oriented/rgb_orientation_1.tiff (100%) rename tests/auto/{ => gui/image}/qimagereader/images/tiff_oriented/rgb_orientation_2.tiff (100%) rename tests/auto/{ => gui/image}/qimagereader/images/tiff_oriented/rgb_orientation_3.tiff (100%) rename tests/auto/{ => gui/image}/qimagereader/images/tiff_oriented/rgb_orientation_4.tiff (100%) rename tests/auto/{ => gui/image}/qimagereader/images/tiff_oriented/rgb_orientation_5.tiff (100%) rename tests/auto/{ => gui/image}/qimagereader/images/tiff_oriented/rgb_orientation_6.tiff (100%) rename tests/auto/{ => gui/image}/qimagereader/images/tiff_oriented/rgb_orientation_7.tiff (100%) rename tests/auto/{ => gui/image}/qimagereader/images/tiff_oriented/rgb_orientation_8.tiff (100%) rename tests/auto/{ => gui/image}/qimagereader/images/transparent.xpm (100%) rename tests/auto/{ => gui/image}/qimagereader/images/trolltech.gif (100%) rename tests/auto/{ => gui/image}/qimagereader/images/tst7.bmp (100%) rename tests/auto/{ => gui/image}/qimagereader/images/tst7.png (100%) rename tests/auto/{ => gui/image}/qimagereader/images/txts.png (100%) rename tests/auto/{ => gui/image}/qimagereader/qimagereader.pro (100%) rename tests/auto/{ => gui/image}/qimagereader/qimagereader.qrc (100%) rename tests/auto/{ => gui/image}/qimagereader/tst_qimagereader.cpp (99%) rename tests/auto/{ => gui/image}/qimagewriter/.gitignore (100%) rename tests/auto/{ => gui/image}/qimagewriter/images/YCbCr_cmyk.jpg (100%) rename tests/auto/{ => gui/image}/qimagewriter/images/YCbCr_rgb.jpg (100%) rename tests/auto/{ => gui/image}/qimagewriter/images/beavis.jpg (100%) rename tests/auto/{ => gui/image}/qimagewriter/images/colorful.bmp (100%) rename tests/auto/{ => gui/image}/qimagewriter/images/earth.gif (100%) rename tests/auto/{ => gui/image}/qimagewriter/images/font.bmp (100%) rename tests/auto/{ => gui/image}/qimagewriter/images/gnus.xbm (100%) rename tests/auto/{ => gui/image}/qimagewriter/images/kollada.png (100%) rename tests/auto/{ => gui/image}/qimagewriter/images/marble.xpm (100%) rename tests/auto/{ => gui/image}/qimagewriter/images/ship63.pbm (100%) rename tests/auto/{ => gui/image}/qimagewriter/images/teapot.ppm (100%) rename tests/auto/{ => gui/image}/qimagewriter/images/teapot.tiff (100%) rename tests/auto/{ => gui/image}/qimagewriter/images/trolltech.gif (100%) rename tests/auto/{ => gui/image}/qimagewriter/qimagewriter.pro (100%) rename tests/auto/{ => gui/image}/qimagewriter/tst_qimagewriter.cpp (100%) rename tests/auto/{ => gui/image}/qmovie/.gitignore (100%) rename tests/auto/{ => gui/image}/qmovie/animations/comicsecard.gif (100%) rename tests/auto/{ => gui/image}/qmovie/animations/corrupt.gif (100%) rename tests/auto/{ => gui/image}/qmovie/animations/dutch.mng (100%) rename tests/auto/{ => gui/image}/qmovie/animations/trolltech.gif (100%) rename tests/auto/{ => gui/image}/qmovie/qmovie.pro (100%) rename tests/auto/{ => gui/image}/qmovie/resources.qrc (100%) rename tests/auto/{ => gui/image}/qmovie/tst_qmovie.cpp (100%) rename tests/auto/{ => gui/image}/qpicture/.gitignore (100%) rename tests/auto/{ => gui/image}/qpicture/qpicture.pro (100%) rename tests/auto/{ => gui/image}/qpicture/tst_qpicture.cpp (100%) rename tests/auto/{ => gui/image}/qpixmap/.gitignore (100%) rename tests/auto/{ => gui/image}/qpixmap/convertFromImage/task31722_0/img1.png (100%) rename tests/auto/{ => gui/image}/qpixmap/convertFromImage/task31722_0/img2.png (100%) rename tests/auto/{ => gui/image}/qpixmap/convertFromImage/task31722_1/img1.png (100%) rename tests/auto/{ => gui/image}/qpixmap/convertFromImage/task31722_1/img2.png (100%) rename tests/auto/{ => gui/image}/qpixmap/convertFromToHICON/icon_32bpp.ico (100%) rename tests/auto/{ => gui/image}/qpixmap/convertFromToHICON/icon_32bpp_16x16.png (100%) rename tests/auto/{ => gui/image}/qpixmap/convertFromToHICON/icon_32bpp_256x256.png (100%) rename tests/auto/{ => gui/image}/qpixmap/convertFromToHICON/icon_32bpp_32x32.png (100%) rename tests/auto/{ => gui/image}/qpixmap/convertFromToHICON/icon_32bpp_48x48.png (100%) rename tests/auto/{ => gui/image}/qpixmap/convertFromToHICON/icon_8bpp.ico (100%) rename tests/auto/{ => gui/image}/qpixmap/convertFromToHICON/icon_8bpp_16x16.png (100%) rename tests/auto/{ => gui/image}/qpixmap/convertFromToHICON/icon_8bpp_32x32.png (100%) rename tests/auto/{ => gui/image}/qpixmap/convertFromToHICON/icon_8bpp_48x48.png (100%) rename tests/auto/{ => gui/image}/qpixmap/images/designer.png (100%) rename tests/auto/{ => gui/image}/qpixmap/images/dx_-10_dy_-10_50_50_100_100.png (100%) rename tests/auto/{ => gui/image}/qpixmap/images/dx_-10_dy_-10_x_y_w_h.png (100%) rename tests/auto/{ => gui/image}/qpixmap/images/dx_-10_dy_0_50_50_100_100.png (100%) rename tests/auto/{ => gui/image}/qpixmap/images/dx_-10_dy_0_x_y_w_h.png (100%) rename tests/auto/{ => gui/image}/qpixmap/images/dx_-128_dy_-128_x_y_w_h.png (100%) rename tests/auto/{ => gui/image}/qpixmap/images/dx_-128_dy_0_x_y_w_h.png (100%) rename tests/auto/{ => gui/image}/qpixmap/images/dx_0_dy_-10_50_50_100_100.png (100%) rename tests/auto/{ => gui/image}/qpixmap/images/dx_0_dy_-10_x_y_w_h.png (100%) rename tests/auto/{ => gui/image}/qpixmap/images/dx_0_dy_-128_x_y_w_h.png (100%) rename tests/auto/{ => gui/image}/qpixmap/images/dx_0_dy_0_50_50_100_100.png (100%) rename tests/auto/{ => gui/image}/qpixmap/images/dx_0_dy_0_null.png (100%) rename tests/auto/{ => gui/image}/qpixmap/images/dx_0_dy_0_x_y_w_h.png (100%) rename tests/auto/{ => gui/image}/qpixmap/images/dx_0_dy_10_50_50_100_100.png (100%) rename tests/auto/{ => gui/image}/qpixmap/images/dx_0_dy_10_x_y_w_h.png (100%) rename tests/auto/{ => gui/image}/qpixmap/images/dx_0_dy_128_x_y_w_h.png (100%) rename tests/auto/{ => gui/image}/qpixmap/images/dx_0_dy_1_null.png (100%) rename tests/auto/{ => gui/image}/qpixmap/images/dx_10_dy_0_50_50_100_100.png (100%) rename tests/auto/{ => gui/image}/qpixmap/images/dx_10_dy_0_x_y_w_h.png (100%) rename tests/auto/{ => gui/image}/qpixmap/images/dx_10_dy_10_50_50_100_100.png (100%) rename tests/auto/{ => gui/image}/qpixmap/images/dx_10_dy_10_x_y_w_h.png (100%) rename tests/auto/{ => gui/image}/qpixmap/images/dx_128_dy_0_x_y_w_h.png (100%) rename tests/auto/{ => gui/image}/qpixmap/images/dx_128_dy_128_64_64_128_128.png (100%) rename tests/auto/{ => gui/image}/qpixmap/images/dx_128_dy_128_x_y_w_h.png (100%) rename tests/auto/{ => gui/image}/qpixmap/images/dx_1_dy_0_null.png (100%) rename tests/auto/{ => gui/image}/qpixmap/loadFromData/designer_argb32.png (100%) rename tests/auto/{ => gui/image}/qpixmap/loadFromData/designer_indexed8_no_alpha.gif (100%) rename tests/auto/{ => gui/image}/qpixmap/loadFromData/designer_indexed8_no_alpha.png (100%) rename tests/auto/{ => gui/image}/qpixmap/loadFromData/designer_indexed8_no_alpha_animated.gif (100%) rename tests/auto/{ => gui/image}/qpixmap/loadFromData/designer_indexed8_with_alpha.gif (100%) rename tests/auto/{ => gui/image}/qpixmap/loadFromData/designer_indexed8_with_alpha.png (100%) rename tests/auto/{ => gui/image}/qpixmap/loadFromData/designer_indexed8_with_alpha_animated.gif (100%) rename tests/auto/{ => gui/image}/qpixmap/loadFromData/designer_rgb32.jpg (100%) rename tests/auto/{ => gui/image}/qpixmap/loadFromData/designer_rgb32.png (100%) rename tests/auto/{ => gui/image}/qpixmap/qpixmap.pro (100%) rename tests/auto/{ => gui/image}/qpixmap/qpixmap.qrc (100%) rename tests/auto/{ => gui/image}/qpixmap/tst_qpixmap.cpp (100%) rename tests/auto/{ => gui/image}/qpixmapcache/.gitignore (100%) rename tests/auto/{ => gui/image}/qpixmapcache/qpixmapcache.pro (100%) rename tests/auto/{ => gui/image}/qpixmapcache/tst_qpixmapcache.cpp (100%) rename tests/auto/{ => gui/image}/qpixmapfilter/noise.png (100%) rename tests/auto/{ => gui/image}/qpixmapfilter/qpixmapfilter.pro (100%) rename tests/auto/{ => gui/image}/qpixmapfilter/tst_qpixmapfilter.cpp (100%) rename tests/auto/{ => gui/image}/qvolatileimage/qvolatileimage.pro (100%) rename tests/auto/{ => gui/image}/qvolatileimage/tst_qvolatileimage.cpp (100%) create mode 100644 tests/auto/gui/kernel/kernel.pro rename tests/auto/{ => gui/kernel}/qclipboard/.gitignore (100%) rename tests/auto/{ => gui/kernel}/qclipboard/copier/copier.pro (100%) rename tests/auto/{ => gui/kernel}/qclipboard/copier/main.cpp (100%) rename tests/auto/{ => gui/kernel}/qclipboard/paster/main.cpp (100%) rename tests/auto/{ => gui/kernel}/qclipboard/paster/paster.pro (100%) rename tests/auto/{ => gui/kernel}/qclipboard/qclipboard.pro (100%) rename tests/auto/{ => gui/kernel}/qclipboard/test/test.pro (100%) rename tests/auto/{ => gui/kernel}/qclipboard/tst_qclipboard.cpp (100%) rename tests/auto/{ => gui/kernel}/qdrag/.gitignore (100%) rename tests/auto/{ => gui/kernel}/qdrag/qdrag.pro (100%) rename tests/auto/{ => gui/kernel}/qdrag/tst_qdrag.cpp (100%) rename tests/auto/{ => gui/kernel}/qevent/.gitignore (100%) rename tests/auto/{ => gui/kernel}/qevent/qevent.pro (100%) rename tests/auto/{ => gui/kernel}/qevent/tst_qevent.cpp (100%) rename tests/auto/{ => gui/kernel}/qfileopenevent/qfileopenevent.pro (100%) rename tests/auto/{ => gui/kernel}/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.cpp (100%) rename tests/auto/{ => gui/kernel}/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.pro (100%) rename tests/auto/{ => gui/kernel}/qfileopenevent/test/test.pro (100%) rename tests/auto/{ => gui/kernel}/qfileopenevent/test/tst_qfileopenevent.cpp (100%) rename tests/auto/{ => gui/kernel}/qguivariant/.gitignore (100%) rename tests/auto/{ => gui/kernel}/qguivariant/qguivariant.pro (100%) rename tests/auto/{ => gui/kernel}/qguivariant/tst_qguivariant.cpp (100%) rename tests/auto/{ => gui/kernel}/qkeysequence/.gitignore (100%) rename tests/auto/{ => gui/kernel}/qkeysequence/keys_de.qm (100%) rename tests/auto/{ => gui/kernel}/qkeysequence/keys_de.ts (100%) rename tests/auto/{ => gui/kernel}/qkeysequence/qkeysequence.pro (100%) rename tests/auto/{ => gui/kernel}/qkeysequence/qkeysequence.qrc (100%) rename tests/auto/{ => gui/kernel}/qkeysequence/qt_de.qm (100%) rename tests/auto/{ => gui/kernel}/qkeysequence/tst_qkeysequence.cpp (100%) rename tests/auto/{ => gui/kernel}/qmouseevent/.gitignore (100%) rename tests/auto/{ => gui/kernel}/qmouseevent/qmouseevent.pro (100%) rename tests/auto/{ => gui/kernel}/qmouseevent/tst_qmouseevent.cpp (100%) rename tests/auto/{ => gui/kernel}/qmouseevent_modal/.gitignore (100%) rename tests/auto/{ => gui/kernel}/qmouseevent_modal/qmouseevent_modal.pro (100%) rename tests/auto/{ => gui/kernel}/qmouseevent_modal/tst_qmouseevent_modal.cpp (100%) rename tests/auto/{ => gui/kernel}/qpalette/.gitignore (100%) rename tests/auto/{ => gui/kernel}/qpalette/qpalette.pro (100%) rename tests/auto/{ => gui/kernel}/qpalette/tst_qpalette.cpp (100%) rename tests/auto/{ => gui/kernel}/qshortcut/.gitignore (100%) rename tests/auto/{ => gui/kernel}/qshortcut/qshortcut.pro (100%) rename tests/auto/{ => gui/kernel}/qshortcut/tst_qshortcut.cpp (100%) rename tests/auto/{ => gui/kernel}/qtouchevent/qtouchevent.pro (100%) rename tests/auto/{ => gui/kernel}/qtouchevent/tst_qtouchevent.cpp (100%) create mode 100644 tests/auto/gui/math3d/math3d.pro rename tests/auto/{ => gui/math3d}/qmatrixnxn/qmatrixnxn.pro (100%) rename tests/auto/{ => gui/math3d}/qmatrixnxn/tst_qmatrixnxn.cpp (100%) rename tests/auto/{ => gui/math3d}/qquaternion/qquaternion.pro (100%) rename tests/auto/{ => gui/math3d}/qquaternion/tst_qquaternion.cpp (100%) rename tests/auto/{ => gui/math3d}/qvectornd/qvectornd.pro (100%) rename tests/auto/{ => gui/math3d}/qvectornd/tst_qvectornd.cpp (100%) create mode 100644 tests/auto/gui/painting/painting.pro rename tests/auto/{ => gui/painting}/qbrush/.gitignore (100%) rename tests/auto/{ => gui/painting}/qbrush/qbrush.pro (100%) rename tests/auto/{ => gui/painting}/qbrush/tst_qbrush.cpp (100%) rename tests/auto/{ => gui/painting}/qcolor/.gitignore (100%) rename tests/auto/{ => gui/painting}/qcolor/qcolor.pro (100%) rename tests/auto/{ => gui/painting}/qcolor/tst_qcolor.cpp (100%) rename tests/auto/{ => gui/painting}/qpaintengine/.gitignore (100%) rename tests/auto/{ => gui/painting}/qpaintengine/qpaintengine.pro (100%) rename tests/auto/{ => gui/painting}/qpaintengine/tst_qpaintengine.cpp (100%) rename tests/auto/{ => gui/painting}/qpainter/.gitignore (100%) rename tests/auto/{ => gui/painting}/qpainter/drawEllipse/10x10SizeAt0x0.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawEllipse/10x10SizeAt100x100.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawEllipse/10x10SizeAt200x200.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawEllipse/13x100SizeAt0x0.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawEllipse/13x100SizeAt100x100.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawEllipse/13x100SizeAt200x200.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawEllipse/200x200SizeAt0x0.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawEllipse/200x200SizeAt100x100.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawEllipse/200x200SizeAt200x200.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawLine_rop_bitmap/dst.xbm (100%) rename tests/auto/{ => gui/painting}/qpainter/drawLine_rop_bitmap/res/res_AndNotROP.xbm (100%) rename tests/auto/{ => gui/painting}/qpainter/drawLine_rop_bitmap/res/res_AndROP.xbm (100%) rename tests/auto/{ => gui/painting}/qpainter/drawLine_rop_bitmap/res/res_ClearROP.xbm (100%) rename tests/auto/{ => gui/painting}/qpainter/drawLine_rop_bitmap/res/res_CopyROP.xbm (100%) rename tests/auto/{ => gui/painting}/qpainter/drawLine_rop_bitmap/res/res_NandROP.xbm (100%) rename tests/auto/{ => gui/painting}/qpainter/drawLine_rop_bitmap/res/res_NopROP.xbm (100%) rename tests/auto/{ => gui/painting}/qpainter/drawLine_rop_bitmap/res/res_NorROP.xbm (100%) rename tests/auto/{ => gui/painting}/qpainter/drawLine_rop_bitmap/res/res_NotAndROP.xbm (100%) rename tests/auto/{ => gui/painting}/qpainter/drawLine_rop_bitmap/res/res_NotCopyROP.xbm (100%) rename tests/auto/{ => gui/painting}/qpainter/drawLine_rop_bitmap/res/res_NotOrROP.xbm (100%) rename tests/auto/{ => gui/painting}/qpainter/drawLine_rop_bitmap/res/res_NotROP.xbm (100%) rename tests/auto/{ => gui/painting}/qpainter/drawLine_rop_bitmap/res/res_NotXorROP.xbm (100%) rename tests/auto/{ => gui/painting}/qpainter/drawLine_rop_bitmap/res/res_OrNotROP.xbm (100%) rename tests/auto/{ => gui/painting}/qpainter/drawLine_rop_bitmap/res/res_OrROP.xbm (100%) rename tests/auto/{ => gui/painting}/qpainter/drawLine_rop_bitmap/res/res_SetROP.xbm (100%) rename tests/auto/{ => gui/painting}/qpainter/drawLine_rop_bitmap/res/res_XorROP.xbm (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/dst1.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/dst2.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/dst3.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_AndNotROP0.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_AndNotROP1.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_AndNotROP2.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_AndNotROP3.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_AndNotROP4.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_AndNotROP5.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_AndNotROP6.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_AndNotROP7.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_AndROP0.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_AndROP1.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_AndROP2.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_AndROP3.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_AndROP4.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_AndROP5.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_AndROP6.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_AndROP7.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_ClearROP0.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_ClearROP1.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_ClearROP2.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_ClearROP3.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_ClearROP4.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_ClearROP5.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_ClearROP6.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_ClearROP7.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_CopyROP0.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_CopyROP1.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_CopyROP2.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_CopyROP3.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_CopyROP4.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_CopyROP5.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_CopyROP6.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_CopyROP7.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NandROP0.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NandROP1.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NandROP2.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NandROP3.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NandROP4.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NandROP5.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NandROP6.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NandROP7.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NopROP0.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NopROP1.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NopROP2.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NopROP3.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NopROP4.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NopROP5.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NopROP6.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NopROP7.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NorROP0.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NorROP1.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NorROP2.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NorROP3.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NorROP4.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NorROP5.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NorROP6.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NorROP7.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NotAndROP0.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NotAndROP1.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NotAndROP2.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NotAndROP3.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NotAndROP4.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NotAndROP5.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NotAndROP6.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NotAndROP7.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NotCopyROP0.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NotCopyROP1.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NotCopyROP2.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NotCopyROP3.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NotCopyROP4.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NotCopyROP5.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NotCopyROP6.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NotCopyROP7.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NotOrROP0.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NotOrROP1.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NotOrROP2.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NotOrROP3.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NotOrROP4.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NotOrROP5.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NotOrROP6.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NotOrROP7.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NotROP0.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NotROP1.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NotROP2.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NotROP3.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NotROP4.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NotROP5.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NotROP6.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NotROP7.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NotXorROP0.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NotXorROP1.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NotXorROP2.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NotXorROP3.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NotXorROP4.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NotXorROP5.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NotXorROP6.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_NotXorROP7.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_OrNotROP0.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_OrNotROP1.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_OrNotROP2.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_OrNotROP3.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_OrNotROP4.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_OrNotROP5.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_OrNotROP6.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_OrNotROP7.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_OrROP0.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_OrROP1.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_OrROP2.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_OrROP3.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_OrROP4.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_OrROP5.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_OrROP6.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_OrROP7.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_SetROP0.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_SetROP1.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_SetROP2.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_SetROP3.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_SetROP4.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_SetROP5.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_SetROP6.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_SetROP7.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_XorROP0.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_XorROP1.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_XorROP2.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_XorROP3.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_XorROP4.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_XorROP5.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_XorROP6.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/res/res_XorROP7.png (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/src1.xbm (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/src2-mask.xbm (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/src2.xbm (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop/src3.xbm (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop_bitmap/dst.xbm (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop_bitmap/res/res_AndNotROP.xbm (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop_bitmap/res/res_AndROP.xbm (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop_bitmap/res/res_ClearROP.xbm (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop_bitmap/res/res_CopyROP.xbm (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop_bitmap/res/res_NandROP.xbm (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop_bitmap/res/res_NopROP.xbm (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop_bitmap/res/res_NorROP.xbm (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop_bitmap/res/res_NotAndROP.xbm (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop_bitmap/res/res_NotCopyROP.xbm (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop_bitmap/res/res_NotOrROP.xbm (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop_bitmap/res/res_NotROP.xbm (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop_bitmap/res/res_NotXorROP.xbm (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop_bitmap/res/res_OrNotROP.xbm (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop_bitmap/res/res_OrROP.xbm (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop_bitmap/res/res_SetROP.xbm (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop_bitmap/res/res_XorROP.xbm (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop_bitmap/src1-mask.xbm (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop_bitmap/src1.xbm (100%) rename tests/auto/{ => gui/painting}/qpainter/drawPixmap_rop_bitmap/src2.xbm (100%) rename tests/auto/{ => gui/painting}/qpainter/qpainter.pro (100%) rename tests/auto/{ => gui/painting}/qpainter/task217400.png (100%) rename tests/auto/{ => gui/painting}/qpainter/tst_qpainter.cpp (99%) rename tests/auto/{ => gui/painting}/qpainter/utils/createImages/createImages.pro (100%) rename tests/auto/{ => gui/painting}/qpainter/utils/createImages/main.cpp (100%) rename tests/auto/{ => gui/painting}/qpainterpath/.gitignore (100%) rename tests/auto/{ => gui/painting}/qpainterpath/qpainterpath.pro (100%) rename tests/auto/{ => gui/painting}/qpainterpath/tst_qpainterpath.cpp (100%) rename tests/auto/{ => gui/painting}/qpainterpathstroker/.gitignore (100%) rename tests/auto/{ => gui/painting}/qpainterpathstroker/qpainterpathstroker.pro (100%) rename tests/auto/{ => gui/painting}/qpainterpathstroker/tst_qpainterpathstroker.cpp (100%) rename tests/auto/{ => gui/painting}/qpathclipper/.gitignore (100%) rename tests/auto/{ => gui/painting}/qpathclipper/pathcompare.h (100%) rename tests/auto/{ => gui/painting}/qpathclipper/paths.cpp (100%) rename tests/auto/{ => gui/painting}/qpathclipper/paths.h (100%) rename tests/auto/{ => gui/painting}/qpathclipper/qpathclipper.pro (100%) rename tests/auto/{ => gui/painting}/qpathclipper/tst_qpathclipper.cpp (100%) rename tests/auto/{ => gui/painting}/qpen/.gitignore (100%) rename tests/auto/{ => gui/painting}/qpen/qpen.pro (100%) rename tests/auto/{ => gui/painting}/qpen/tst_qpen.cpp (100%) rename tests/auto/{ => gui/painting}/qpolygon/.gitignore (100%) rename tests/auto/{ => gui/painting}/qpolygon/qpolygon.pro (100%) rename tests/auto/{ => gui/painting}/qpolygon/tst_qpolygon.cpp (100%) rename tests/auto/{ => gui/painting}/qprinter/.gitignore (100%) rename tests/auto/{ => gui/painting}/qprinter/qprinter.pro (100%) rename tests/auto/{ => gui/painting}/qprinter/tst_qprinter.cpp (100%) rename tests/auto/{ => gui/painting}/qprinterinfo/.gitignore (100%) rename tests/auto/{ => gui/painting}/qprinterinfo/qprinterinfo.pro (100%) rename tests/auto/{ => gui/painting}/qprinterinfo/tst_qprinterinfo.cpp (100%) rename tests/auto/{ => gui/painting}/qregion/.gitignore (100%) rename tests/auto/{ => gui/painting}/qregion/qregion.pro (100%) rename tests/auto/{ => gui/painting}/qregion/tst_qregion.cpp (100%) rename tests/auto/{ => gui/painting}/qtransform/.gitignore (100%) rename tests/auto/{ => gui/painting}/qtransform/qtransform.pro (100%) rename tests/auto/{ => gui/painting}/qtransform/tst_qtransform.cpp (100%) rename tests/auto/{ => gui/painting}/qwmatrix/.gitignore (100%) rename tests/auto/{ => gui/painting}/qwmatrix/qwmatrix.pro (100%) rename tests/auto/{ => gui/painting}/qwmatrix/tst_qwmatrix.cpp (100%) rename tests/auto/{ => gui/text}/qabstracttextdocumentlayout/.gitignore (100%) rename tests/auto/{ => gui/text}/qabstracttextdocumentlayout/qabstracttextdocumentlayout.pro (100%) rename tests/auto/{ => gui/text}/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp (100%) rename tests/auto/{ => gui/text}/qcssparser/.gitignore (100%) rename tests/auto/{ => gui/text}/qcssparser/qcssparser.pro (100%) rename tests/auto/{ => gui/text}/qcssparser/testdata/scanner/comments/input (100%) rename tests/auto/{ => gui/text}/qcssparser/testdata/scanner/comments/output (100%) rename tests/auto/{ => gui/text}/qcssparser/testdata/scanner/comments2/input (100%) rename tests/auto/{ => gui/text}/qcssparser/testdata/scanner/comments2/output (100%) rename tests/auto/{ => gui/text}/qcssparser/testdata/scanner/comments3/input (100%) rename tests/auto/{ => gui/text}/qcssparser/testdata/scanner/comments3/output (100%) rename tests/auto/{ => gui/text}/qcssparser/testdata/scanner/comments4/input (100%) rename tests/auto/{ => gui/text}/qcssparser/testdata/scanner/comments4/output (100%) rename tests/auto/{ => gui/text}/qcssparser/testdata/scanner/quotedstring/input (100%) rename tests/auto/{ => gui/text}/qcssparser/testdata/scanner/quotedstring/output (100%) rename tests/auto/{ => gui/text}/qcssparser/testdata/scanner/simple/input (100%) rename tests/auto/{ => gui/text}/qcssparser/testdata/scanner/simple/output (100%) rename tests/auto/{ => gui/text}/qcssparser/testdata/scanner/unicode/input (100%) rename tests/auto/{ => gui/text}/qcssparser/testdata/scanner/unicode/output (100%) rename tests/auto/{ => gui/text}/qcssparser/tst_qcssparser.cpp (100%) rename tests/auto/{ => gui/text}/qfont/.gitignore (100%) rename tests/auto/{ => gui/text}/qfont/qfont.pro (100%) rename tests/auto/{ => gui/text}/qfont/tst_qfont.cpp (100%) rename tests/auto/{ => gui/text}/qfontdatabase/.gitignore (100%) rename tests/auto/{ => gui/text}/qfontdatabase/FreeMono.ttf (100%) rename tests/auto/{ => gui/text}/qfontdatabase/qfontdatabase.pro (100%) rename tests/auto/{ => gui/text}/qfontdatabase/tst_qfontdatabase.cpp (100%) rename tests/auto/{ => gui/text}/qfontmetrics/.gitignore (100%) rename tests/auto/{ => gui/text}/qfontmetrics/qfontmetrics.pro (100%) rename tests/auto/{ => gui/text}/qfontmetrics/testfont.qrc (100%) rename tests/auto/{ => gui/text}/qfontmetrics/tst_qfontmetrics.cpp (100%) rename tests/auto/{ => gui/text}/qfontmetrics/ucs4font.ttf (100%) rename tests/auto/{ => gui/text}/qglyphrun/qglyphrun.pro (100%) rename tests/auto/{ => gui/text}/qglyphrun/test.ttf (100%) rename tests/auto/{ => gui/text}/qglyphrun/tst_qglyphrun.cpp (100%) rename tests/auto/{ => gui/text}/qrawfont/qrawfont.pro (100%) rename tests/auto/{ => gui/text}/qrawfont/testfont.ttf (100%) rename tests/auto/{ => gui/text}/qrawfont/testfont_bold_italic.ttf (100%) rename tests/auto/{ => gui/text}/qrawfont/tst_qrawfont.cpp (100%) rename tests/auto/{ => gui/text}/qstatictext/qstatictext.pro (100%) rename tests/auto/{ => gui/text}/qstatictext/tst_qstatictext.cpp (100%) rename tests/auto/{ => gui/text}/qsyntaxhighlighter/.gitignore (100%) rename tests/auto/{ => gui/text}/qsyntaxhighlighter/qsyntaxhighlighter.pro (100%) rename tests/auto/{ => gui/text}/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp (100%) rename tests/auto/{ => gui/text}/qtextblock/.gitignore (100%) rename tests/auto/{ => gui/text}/qtextblock/qtextblock.pro (100%) rename tests/auto/{ => gui/text}/qtextblock/tst_qtextblock.cpp (100%) rename tests/auto/{ => gui/text}/qtextcursor/.gitignore (100%) rename tests/auto/{ => gui/text}/qtextcursor/qtextcursor.pro (100%) rename tests/auto/{ => gui/text}/qtextcursor/tst_qtextcursor.cpp (100%) rename tests/auto/{ => gui/text}/qtextdocument/.gitignore (100%) rename tests/auto/{ => gui/text}/qtextdocument/common.h (100%) rename tests/auto/{ => gui/text}/qtextdocument/qtextdocument.pro (100%) rename tests/auto/{ => gui/text}/qtextdocument/tst_qtextdocument.cpp (100%) rename tests/auto/{ => gui/text}/qtextdocumentfragment/.gitignore (100%) rename tests/auto/{ => gui/text}/qtextdocumentfragment/qtextdocumentfragment.pro (100%) rename tests/auto/{ => gui/text}/qtextdocumentfragment/tst_qtextdocumentfragment.cpp (100%) rename tests/auto/{ => gui/text}/qtextdocumentlayout/.gitignore (100%) rename tests/auto/{ => gui/text}/qtextdocumentlayout/qtextdocumentlayout.pro (100%) rename tests/auto/{ => gui/text}/qtextdocumentlayout/tst_qtextdocumentlayout.cpp (100%) rename tests/auto/{ => gui/text}/qtextformat/.gitignore (100%) rename tests/auto/{ => gui/text}/qtextformat/qtextformat.pro (100%) rename tests/auto/{ => gui/text}/qtextformat/tst_qtextformat.cpp (100%) rename tests/auto/{ => gui/text}/qtextlayout/.gitignore (100%) rename tests/auto/{ => gui/text}/qtextlayout/qtextlayout.pro (100%) rename tests/auto/{ => gui/text}/qtextlayout/tst_qtextlayout.cpp (100%) rename tests/auto/{ => gui/text}/qtextlist/.gitignore (100%) rename tests/auto/{ => gui/text}/qtextlist/qtextlist.pro (100%) rename tests/auto/{ => gui/text}/qtextlist/tst_qtextlist.cpp (100%) rename tests/auto/{ => gui/text}/qtextobject/.gitignore (100%) rename tests/auto/{ => gui/text}/qtextobject/qtextobject.pro (100%) rename tests/auto/{ => gui/text}/qtextobject/tst_qtextobject.cpp (100%) rename tests/auto/{ => gui/text}/qtextodfwriter/.gitignore (100%) rename tests/auto/{ => gui/text}/qtextodfwriter/qtextodfwriter.pro (83%) rename tests/auto/{ => gui/text}/qtextodfwriter/tst_qtextodfwriter.cpp (100%) rename tests/auto/{ => gui/text}/qtextpiecetable/.gitignore (100%) rename tests/auto/{ => gui/text}/qtextpiecetable/qtextpiecetable.pro (100%) rename tests/auto/{ => gui/text}/qtextpiecetable/tst_qtextpiecetable.cpp (100%) rename tests/auto/{ => gui/text}/qtextscriptengine/.gitignore (100%) rename tests/auto/{ => gui/text}/qtextscriptengine/generate/generate.pro (100%) rename tests/auto/{ => gui/text}/qtextscriptengine/generate/main.cpp (100%) rename tests/auto/{ => gui/text}/qtextscriptengine/qtextscriptengine.pro (100%) rename tests/auto/{ => gui/text}/qtextscriptengine/tst_qtextscriptengine.cpp (100%) rename tests/auto/{ => gui/text}/qtexttable/.gitignore (100%) rename tests/auto/{ => gui/text}/qtexttable/qtexttable.pro (100%) rename tests/auto/{ => gui/text}/qtexttable/tst_qtexttable.cpp (100%) rename tests/auto/{ => gui/text}/qzip/.gitignore (100%) rename tests/auto/{ => gui/text}/qzip/qzip.pro (92%) rename tests/auto/{ => gui/text}/qzip/testdata/symlink.zip (100%) rename tests/auto/{ => gui/text}/qzip/testdata/test.zip (100%) rename tests/auto/{ => gui/text}/qzip/tst_qzip.cpp (100%) create mode 100644 tests/auto/gui/text/text.pro rename tests/auto/{ => gui/util}/qdesktopservices/.gitignore (100%) rename tests/auto/{ => gui/util}/qdesktopservices/qdesktopservices.pro (100%) rename tests/auto/{ => gui/util}/qdesktopservices/tst_qdesktopservices.cpp (100%) create mode 100644 tests/auto/gui/util/util.pro diff --git a/tests/auto/corelib.pro b/tests/auto/corelib.pro index c64ed21b98d..da2089b66ba 100644 --- a/tests/auto/corelib.pro +++ b/tests/auto/corelib.pro @@ -17,7 +17,6 @@ SUBDIRS=\ qdatetime \ qeasingcurve \ qelapsedtimer \ - qevent \ qexplicitlyshareddatapointer \ qfreelist \ qhash \ diff --git a/tests/auto/gui.pro b/tests/auto/gui.pro index 20194f9b7b4..7525c6d5ce2 100644 --- a/tests/auto/gui.pro +++ b/tests/auto/gui.pro @@ -5,6 +5,7 @@ # TEMPLATE=subdirs SUBDIRS=\ + gui \ gestures \ languagechange \ modeltest \ @@ -16,17 +17,13 @@ SUBDIRS=\ qabstractscrollarea \ qabstractslider \ qabstractspinbox \ - qabstracttextdocumentlayout \ qaction \ qactiongroup \ qapplication \ qboxlayout \ - qbrush \ qbuttongroup \ qcalendarwidget \ qcheckbox \ - qclipboard \ - qcolor \ qcolordialog \ qcolumnview \ qcommandlinkbutton \ @@ -34,7 +31,6 @@ SUBDIRS=\ qcomplextext \ qdatawidgetmapper \ qdatetimeedit \ - qdesktopservices \ qdesktopwidget \ qdial \ qdialog \ @@ -43,21 +39,15 @@ SUBDIRS=\ qdockwidget \ qdoublespinbox \ qdoublevalidator \ - qdrag \ qerrormessage \ qfiledialog \ qfiledialog2 \ qfileiconprovider \ - qfileopenevent \ qfilesystemmodel \ qfocusframe \ - qfont \ qfontcombobox \ - qfontdatabase \ qfontdialog \ - qfontmetrics \ qformlayout \ - qglyphrun \ qgraphicsanchorlayout \ qgraphicsanchorlayout1 \ qgraphicseffect \ @@ -79,14 +69,8 @@ SUBDIRS=\ qgraphicswidget \ qgridlayout \ qgroupbox \ - qguivariant \ qheaderview \ - qicoimageformat \ - qicon \ qidentityproxymodel \ - qimageiohandler \ - qimagereader \ - qimagewriter \ qinputcontext \ qinputdialog \ qintvalidator \ @@ -94,7 +78,6 @@ SUBDIRS=\ qitemeditorfactory \ qitemselectionmodel \ qitemview \ - qkeysequence \ qlabel \ qlcdnumber \ qlineedit \ @@ -105,42 +88,23 @@ SUBDIRS=\ #qlocalsocket \ # FIXME: uses qtscript (QTBUG-19242) qmacstyle \ qmainwindow \ - qmatrixnxn \ qmdisubwindow \ qmessagebox \ qmetaobject \ qmimedata \ - qmouseevent_modal \ - qmovie \ - qvolatileimage \ qnetworkaccessmanager_and_qprogressdialog \ qopengl \ - qpaintengine \ - qpainterpath \ - qpainterpathstroker \ - qpalette \ - qpathclipper \ - qpen \ - qpicture \ - qpixmapcache \ - qpixmapfilter \ qplaintextedit \ qpointer \ - qpolygon \ - qprinterinfo \ qprogressbar \ qprogressdialog \ qpushbutton \ - qquaternion \ qradiobutton \ - qrawfont \ qregexpvalidator \ - qregion \ qscrollarea \ qscrollbar \ qscroller \ qsharedpointer_and_qwidget \ - qshortcut \ qsidebar \ qsignalmapper \ qsizegrip \ @@ -153,35 +117,20 @@ SUBDIRS=\ qstandarditem \ qstandarditemmodel \ qstatemachine \ - qstatictext \ qstatusbar \ qstringlistmodel \ qstyle \ qstyleoption \ qstylesheetstyle \ - qsyntaxhighlighter \ qsystemtrayicon \ qtabbar \ qtableview \ qtablewidget \ qtcpsocket \ - qtextblock \ - qtextcursor \ - qtextdocumentfragment \ - qtextdocumentlayout \ - qtextformat \ - qtextlayout \ - qtextlist \ - qtextobject \ - qtextpiecetable \ - qtextscriptengine \ - qtexttable \ qtipc \ qtoolbar \ qtoolbox \ qtooltip \ - qtouchevent \ - qtransform \ qtransformedscreen \ qtranslator \ qtreeview \ @@ -189,12 +138,10 @@ SUBDIRS=\ qtreewidgetitemiterator \ qundogroup \ qundostack \ - qvectornd \ qwidget_window \ qwidgetaction \ qwindowsurface \ qwizard \ - qwmatrix \ qwsembedwidget \ qwsinputmethod \ qwswindowsystem \ @@ -212,15 +159,10 @@ win32:SUBDIRS -= qtextpiecetable qlistwidget \ qmainwindow \ qnetworkreply \ - qpathclipper \ - qpixmapcache \ qsidebar \ qstylesheetstyle \ - qtextlayout \ - qtextpiecetable \ qtipc \ qtoolbar \ - qstatictext \ symbian:SUBDIRS -= \ qsystemtrayicon \ diff --git a/tests/auto/gui/gui.pro b/tests/auto/gui/gui.pro new file mode 100644 index 00000000000..d54198467db --- /dev/null +++ b/tests/auto/gui/gui.pro @@ -0,0 +1,9 @@ +TEMPLATE=subdirs +SUBDIRS=\ + image \ + kernel \ + math3d \ + painting \ + text \ + util \ + diff --git a/tests/auto/gui/image/image.pro b/tests/auto/gui/image/image.pro new file mode 100644 index 00000000000..fe089f5e750 --- /dev/null +++ b/tests/auto/gui/image/image.pro @@ -0,0 +1,18 @@ +TEMPLATE=subdirs +SUBDIRS=\ + qimagereader \ + qicoimageformat \ + qpixmap \ + qpixmapcache \ + qimage \ + qpixmapfilter \ + qimageiohandler \ + qimagewriter \ + qmovie \ + qvolatileimage \ + qicon \ + qpicture \ + +!contains(QT_CONFIG, private_tests): SUBDIRS -= \ + qpixmapcache \ + diff --git a/tests/auto/qicoimageformat/.gitignore b/tests/auto/gui/image/qicoimageformat/.gitignore similarity index 100% rename from tests/auto/qicoimageformat/.gitignore rename to tests/auto/gui/image/qicoimageformat/.gitignore diff --git a/tests/auto/qicoimageformat/icons/invalid/35floppy.ico b/tests/auto/gui/image/qicoimageformat/icons/invalid/35floppy.ico similarity index 100% rename from tests/auto/qicoimageformat/icons/invalid/35floppy.ico rename to tests/auto/gui/image/qicoimageformat/icons/invalid/35floppy.ico diff --git a/tests/auto/qicoimageformat/icons/valid/35FLOPPY.ICO b/tests/auto/gui/image/qicoimageformat/icons/valid/35FLOPPY.ICO similarity index 100% rename from tests/auto/qicoimageformat/icons/valid/35FLOPPY.ICO rename to tests/auto/gui/image/qicoimageformat/icons/valid/35FLOPPY.ICO diff --git a/tests/auto/qicoimageformat/icons/valid/AddPerfMon.ico b/tests/auto/gui/image/qicoimageformat/icons/valid/AddPerfMon.ico similarity index 100% rename from tests/auto/qicoimageformat/icons/valid/AddPerfMon.ico rename to tests/auto/gui/image/qicoimageformat/icons/valid/AddPerfMon.ico diff --git a/tests/auto/qicoimageformat/icons/valid/App.ico b/tests/auto/gui/image/qicoimageformat/icons/valid/App.ico similarity index 100% rename from tests/auto/qicoimageformat/icons/valid/App.ico rename to tests/auto/gui/image/qicoimageformat/icons/valid/App.ico diff --git a/tests/auto/qicoimageformat/icons/valid/Obj_N2_Internal_Mem.ico b/tests/auto/gui/image/qicoimageformat/icons/valid/Obj_N2_Internal_Mem.ico similarity index 100% rename from tests/auto/qicoimageformat/icons/valid/Obj_N2_Internal_Mem.ico rename to tests/auto/gui/image/qicoimageformat/icons/valid/Obj_N2_Internal_Mem.ico diff --git a/tests/auto/qicoimageformat/icons/valid/Qt.ico b/tests/auto/gui/image/qicoimageformat/icons/valid/Qt.ico similarity index 100% rename from tests/auto/qicoimageformat/icons/valid/Qt.ico rename to tests/auto/gui/image/qicoimageformat/icons/valid/Qt.ico diff --git a/tests/auto/qicoimageformat/icons/valid/Status_Play.ico b/tests/auto/gui/image/qicoimageformat/icons/valid/Status_Play.ico similarity index 100% rename from tests/auto/qicoimageformat/icons/valid/Status_Play.ico rename to tests/auto/gui/image/qicoimageformat/icons/valid/Status_Play.ico diff --git a/tests/auto/qicoimageformat/icons/valid/TIMER01.ICO b/tests/auto/gui/image/qicoimageformat/icons/valid/TIMER01.ICO similarity index 100% rename from tests/auto/qicoimageformat/icons/valid/TIMER01.ICO rename to tests/auto/gui/image/qicoimageformat/icons/valid/TIMER01.ICO diff --git a/tests/auto/qicoimageformat/icons/valid/WORLD.ico b/tests/auto/gui/image/qicoimageformat/icons/valid/WORLD.ico similarity index 100% rename from tests/auto/qicoimageformat/icons/valid/WORLD.ico rename to tests/auto/gui/image/qicoimageformat/icons/valid/WORLD.ico diff --git a/tests/auto/qicoimageformat/icons/valid/WORLDH.ico b/tests/auto/gui/image/qicoimageformat/icons/valid/WORLDH.ico similarity index 100% rename from tests/auto/qicoimageformat/icons/valid/WORLDH.ico rename to tests/auto/gui/image/qicoimageformat/icons/valid/WORLDH.ico diff --git a/tests/auto/qicoimageformat/icons/valid/abcardWindow.ico b/tests/auto/gui/image/qicoimageformat/icons/valid/abcardWindow.ico similarity index 100% rename from tests/auto/qicoimageformat/icons/valid/abcardWindow.ico rename to tests/auto/gui/image/qicoimageformat/icons/valid/abcardWindow.ico diff --git a/tests/auto/qicoimageformat/icons/valid/semitransparent.ico b/tests/auto/gui/image/qicoimageformat/icons/valid/semitransparent.ico similarity index 100% rename from tests/auto/qicoimageformat/icons/valid/semitransparent.ico rename to tests/auto/gui/image/qicoimageformat/icons/valid/semitransparent.ico diff --git a/tests/auto/qicoimageformat/icons/valid/trolltechlogo_tiny.ico b/tests/auto/gui/image/qicoimageformat/icons/valid/trolltechlogo_tiny.ico similarity index 100% rename from tests/auto/qicoimageformat/icons/valid/trolltechlogo_tiny.ico rename to tests/auto/gui/image/qicoimageformat/icons/valid/trolltechlogo_tiny.ico diff --git a/tests/auto/qicoimageformat/qicoimageformat.pro b/tests/auto/gui/image/qicoimageformat/qicoimageformat.pro similarity index 100% rename from tests/auto/qicoimageformat/qicoimageformat.pro rename to tests/auto/gui/image/qicoimageformat/qicoimageformat.pro diff --git a/tests/auto/qicoimageformat/tst_qicoimageformat.cpp b/tests/auto/gui/image/qicoimageformat/tst_qicoimageformat.cpp similarity index 100% rename from tests/auto/qicoimageformat/tst_qicoimageformat.cpp rename to tests/auto/gui/image/qicoimageformat/tst_qicoimageformat.cpp diff --git a/tests/auto/qicon/.gitignore b/tests/auto/gui/image/qicon/.gitignore similarity index 100% rename from tests/auto/qicon/.gitignore rename to tests/auto/gui/image/qicon/.gitignore diff --git a/tests/auto/qicon/heart.svg b/tests/auto/gui/image/qicon/heart.svg similarity index 100% rename from tests/auto/qicon/heart.svg rename to tests/auto/gui/image/qicon/heart.svg diff --git a/tests/auto/qicon/heart.svgz b/tests/auto/gui/image/qicon/heart.svgz similarity index 100% rename from tests/auto/qicon/heart.svgz rename to tests/auto/gui/image/qicon/heart.svgz diff --git a/tests/auto/qicon/icons/testtheme/16x16/actions/appointment-new.png b/tests/auto/gui/image/qicon/icons/testtheme/16x16/actions/appointment-new.png similarity index 100% rename from tests/auto/qicon/icons/testtheme/16x16/actions/appointment-new.png rename to tests/auto/gui/image/qicon/icons/testtheme/16x16/actions/appointment-new.png diff --git a/tests/auto/qicon/icons/testtheme/22x22/actions/appointment-new.png b/tests/auto/gui/image/qicon/icons/testtheme/22x22/actions/appointment-new.png similarity index 100% rename from tests/auto/qicon/icons/testtheme/22x22/actions/appointment-new.png rename to tests/auto/gui/image/qicon/icons/testtheme/22x22/actions/appointment-new.png diff --git a/tests/auto/qicon/icons/testtheme/32x32/actions/appointment-new.png b/tests/auto/gui/image/qicon/icons/testtheme/32x32/actions/appointment-new.png similarity index 100% rename from tests/auto/qicon/icons/testtheme/32x32/actions/appointment-new.png rename to tests/auto/gui/image/qicon/icons/testtheme/32x32/actions/appointment-new.png diff --git a/tests/auto/qicon/icons/testtheme/index.theme b/tests/auto/gui/image/qicon/icons/testtheme/index.theme similarity index 100% rename from tests/auto/qicon/icons/testtheme/index.theme rename to tests/auto/gui/image/qicon/icons/testtheme/index.theme diff --git a/tests/auto/qicon/icons/testtheme/scalable/actions/svg-only.svg b/tests/auto/gui/image/qicon/icons/testtheme/scalable/actions/svg-only.svg similarity index 100% rename from tests/auto/qicon/icons/testtheme/scalable/actions/svg-only.svg rename to tests/auto/gui/image/qicon/icons/testtheme/scalable/actions/svg-only.svg diff --git a/tests/auto/qicon/icons/themeparent/16x16/actions/address-book-new.png b/tests/auto/gui/image/qicon/icons/themeparent/16x16/actions/address-book-new.png similarity index 100% rename from tests/auto/qicon/icons/themeparent/16x16/actions/address-book-new.png rename to tests/auto/gui/image/qicon/icons/themeparent/16x16/actions/address-book-new.png diff --git a/tests/auto/qicon/icons/themeparent/16x16/actions/appointment-new.png b/tests/auto/gui/image/qicon/icons/themeparent/16x16/actions/appointment-new.png similarity index 100% rename from tests/auto/qicon/icons/themeparent/16x16/actions/appointment-new.png rename to tests/auto/gui/image/qicon/icons/themeparent/16x16/actions/appointment-new.png diff --git a/tests/auto/qicon/icons/themeparent/22x22/actions/address-book-new.png b/tests/auto/gui/image/qicon/icons/themeparent/22x22/actions/address-book-new.png similarity index 100% rename from tests/auto/qicon/icons/themeparent/22x22/actions/address-book-new.png rename to tests/auto/gui/image/qicon/icons/themeparent/22x22/actions/address-book-new.png diff --git a/tests/auto/qicon/icons/themeparent/22x22/actions/appointment-new.png b/tests/auto/gui/image/qicon/icons/themeparent/22x22/actions/appointment-new.png similarity index 100% rename from tests/auto/qicon/icons/themeparent/22x22/actions/appointment-new.png rename to tests/auto/gui/image/qicon/icons/themeparent/22x22/actions/appointment-new.png diff --git a/tests/auto/qicon/icons/themeparent/32x32/actions/address-book-new.png b/tests/auto/gui/image/qicon/icons/themeparent/32x32/actions/address-book-new.png similarity index 100% rename from tests/auto/qicon/icons/themeparent/32x32/actions/address-book-new.png rename to tests/auto/gui/image/qicon/icons/themeparent/32x32/actions/address-book-new.png diff --git a/tests/auto/qicon/icons/themeparent/32x32/actions/appointment-new.png b/tests/auto/gui/image/qicon/icons/themeparent/32x32/actions/appointment-new.png similarity index 100% rename from tests/auto/qicon/icons/themeparent/32x32/actions/appointment-new.png rename to tests/auto/gui/image/qicon/icons/themeparent/32x32/actions/appointment-new.png diff --git a/tests/auto/qicon/icons/themeparent/index.theme b/tests/auto/gui/image/qicon/icons/themeparent/index.theme similarity index 100% rename from tests/auto/qicon/icons/themeparent/index.theme rename to tests/auto/gui/image/qicon/icons/themeparent/index.theme diff --git a/tests/auto/qicon/icons/themeparent/scalable/actions/address-book-new.svg b/tests/auto/gui/image/qicon/icons/themeparent/scalable/actions/address-book-new.svg similarity index 100% rename from tests/auto/qicon/icons/themeparent/scalable/actions/address-book-new.svg rename to tests/auto/gui/image/qicon/icons/themeparent/scalable/actions/address-book-new.svg diff --git a/tests/auto/qicon/icons/themeparent/scalable/actions/appointment-new.svg b/tests/auto/gui/image/qicon/icons/themeparent/scalable/actions/appointment-new.svg similarity index 100% rename from tests/auto/qicon/icons/themeparent/scalable/actions/appointment-new.svg rename to tests/auto/gui/image/qicon/icons/themeparent/scalable/actions/appointment-new.svg diff --git a/tests/auto/qicon/image.png b/tests/auto/gui/image/qicon/image.png similarity index 100% rename from tests/auto/qicon/image.png rename to tests/auto/gui/image/qicon/image.png diff --git a/tests/auto/qicon/qicon.pro b/tests/auto/gui/image/qicon/qicon.pro similarity index 100% rename from tests/auto/qicon/qicon.pro rename to tests/auto/gui/image/qicon/qicon.pro diff --git a/tests/auto/qicon/rect.png b/tests/auto/gui/image/qicon/rect.png similarity index 100% rename from tests/auto/qicon/rect.png rename to tests/auto/gui/image/qicon/rect.png diff --git a/tests/auto/qicon/rect.svg b/tests/auto/gui/image/qicon/rect.svg similarity index 100% rename from tests/auto/qicon/rect.svg rename to tests/auto/gui/image/qicon/rect.svg diff --git a/tests/auto/qicon/trash.svg b/tests/auto/gui/image/qicon/trash.svg similarity index 100% rename from tests/auto/qicon/trash.svg rename to tests/auto/gui/image/qicon/trash.svg diff --git a/tests/auto/qicon/tst_qicon.cpp b/tests/auto/gui/image/qicon/tst_qicon.cpp similarity index 100% rename from tests/auto/qicon/tst_qicon.cpp rename to tests/auto/gui/image/qicon/tst_qicon.cpp diff --git a/tests/auto/qicon/tst_qicon.qrc b/tests/auto/gui/image/qicon/tst_qicon.qrc similarity index 100% rename from tests/auto/qicon/tst_qicon.qrc rename to tests/auto/gui/image/qicon/tst_qicon.qrc diff --git a/tests/auto/qimage/.gitignore b/tests/auto/gui/image/qimage/.gitignore similarity index 100% rename from tests/auto/qimage/.gitignore rename to tests/auto/gui/image/qimage/.gitignore diff --git a/tests/auto/qimage/images/image.bmp b/tests/auto/gui/image/qimage/images/image.bmp similarity index 100% rename from tests/auto/qimage/images/image.bmp rename to tests/auto/gui/image/qimage/images/image.bmp diff --git a/tests/auto/qimage/images/image.gif b/tests/auto/gui/image/qimage/images/image.gif similarity index 100% rename from tests/auto/qimage/images/image.gif rename to tests/auto/gui/image/qimage/images/image.gif diff --git a/tests/auto/qimage/images/image.ico b/tests/auto/gui/image/qimage/images/image.ico similarity index 100% rename from tests/auto/qimage/images/image.ico rename to tests/auto/gui/image/qimage/images/image.ico diff --git a/tests/auto/qimage/images/image.jpg b/tests/auto/gui/image/qimage/images/image.jpg similarity index 100% rename from tests/auto/qimage/images/image.jpg rename to tests/auto/gui/image/qimage/images/image.jpg diff --git a/tests/auto/qimage/images/image.pbm b/tests/auto/gui/image/qimage/images/image.pbm similarity index 100% rename from tests/auto/qimage/images/image.pbm rename to tests/auto/gui/image/qimage/images/image.pbm diff --git a/tests/auto/qimage/images/image.pgm b/tests/auto/gui/image/qimage/images/image.pgm similarity index 100% rename from tests/auto/qimage/images/image.pgm rename to tests/auto/gui/image/qimage/images/image.pgm diff --git a/tests/auto/qimage/images/image.png b/tests/auto/gui/image/qimage/images/image.png similarity index 100% rename from tests/auto/qimage/images/image.png rename to tests/auto/gui/image/qimage/images/image.png diff --git a/tests/auto/qimage/images/image.ppm b/tests/auto/gui/image/qimage/images/image.ppm similarity index 100% rename from tests/auto/qimage/images/image.ppm rename to tests/auto/gui/image/qimage/images/image.ppm diff --git a/tests/auto/qimage/images/image.tif b/tests/auto/gui/image/qimage/images/image.tif similarity index 100% rename from tests/auto/qimage/images/image.tif rename to tests/auto/gui/image/qimage/images/image.tif diff --git a/tests/auto/qimage/images/image.xbm b/tests/auto/gui/image/qimage/images/image.xbm similarity index 100% rename from tests/auto/qimage/images/image.xbm rename to tests/auto/gui/image/qimage/images/image.xbm diff --git a/tests/auto/qimage/images/image.xpm b/tests/auto/gui/image/qimage/images/image.xpm similarity index 100% rename from tests/auto/qimage/images/image.xpm rename to tests/auto/gui/image/qimage/images/image.xpm diff --git a/tests/auto/qimage/qimage.pro b/tests/auto/gui/image/qimage/qimage.pro similarity index 100% rename from tests/auto/qimage/qimage.pro rename to tests/auto/gui/image/qimage/qimage.pro diff --git a/tests/auto/qimage/tst_qimage.cpp b/tests/auto/gui/image/qimage/tst_qimage.cpp similarity index 100% rename from tests/auto/qimage/tst_qimage.cpp rename to tests/auto/gui/image/qimage/tst_qimage.cpp diff --git a/tests/auto/qimageiohandler/.gitignore b/tests/auto/gui/image/qimageiohandler/.gitignore similarity index 100% rename from tests/auto/qimageiohandler/.gitignore rename to tests/auto/gui/image/qimageiohandler/.gitignore diff --git a/tests/auto/qimageiohandler/qimageiohandler.pro b/tests/auto/gui/image/qimageiohandler/qimageiohandler.pro similarity index 100% rename from tests/auto/qimageiohandler/qimageiohandler.pro rename to tests/auto/gui/image/qimageiohandler/qimageiohandler.pro diff --git a/tests/auto/qimageiohandler/tst_qimageiohandler.cpp b/tests/auto/gui/image/qimageiohandler/tst_qimageiohandler.cpp similarity index 100% rename from tests/auto/qimageiohandler/tst_qimageiohandler.cpp rename to tests/auto/gui/image/qimageiohandler/tst_qimageiohandler.cpp diff --git a/tests/auto/qimagereader/.gitignore b/tests/auto/gui/image/qimagereader/.gitignore similarity index 100% rename from tests/auto/qimagereader/.gitignore rename to tests/auto/gui/image/qimagereader/.gitignore diff --git a/tests/auto/qimagereader/baseline/35floppy.png b/tests/auto/gui/image/qimagereader/baseline/35floppy.png similarity index 100% rename from tests/auto/qimagereader/baseline/35floppy.png rename to tests/auto/gui/image/qimagereader/baseline/35floppy.png diff --git a/tests/auto/qimagereader/baseline/connect.png b/tests/auto/gui/image/qimagereader/baseline/connect.png similarity index 100% rename from tests/auto/qimagereader/baseline/connect.png rename to tests/auto/gui/image/qimagereader/baseline/connect.png diff --git a/tests/auto/qimagereader/baseline/kde_favicon.png b/tests/auto/gui/image/qimagereader/baseline/kde_favicon.png similarity index 100% rename from tests/auto/qimagereader/baseline/kde_favicon.png rename to tests/auto/gui/image/qimagereader/baseline/kde_favicon.png diff --git a/tests/auto/qimagereader/baseline/semitransparent.png b/tests/auto/gui/image/qimagereader/baseline/semitransparent.png similarity index 100% rename from tests/auto/qimagereader/baseline/semitransparent.png rename to tests/auto/gui/image/qimagereader/baseline/semitransparent.png diff --git a/tests/auto/qimagereader/images/16bpp.bmp b/tests/auto/gui/image/qimagereader/images/16bpp.bmp similarity index 100% rename from tests/auto/qimagereader/images/16bpp.bmp rename to tests/auto/gui/image/qimagereader/images/16bpp.bmp diff --git a/tests/auto/qimagereader/images/4bpp-rle.bmp b/tests/auto/gui/image/qimagereader/images/4bpp-rle.bmp similarity index 100% rename from tests/auto/qimagereader/images/4bpp-rle.bmp rename to tests/auto/gui/image/qimagereader/images/4bpp-rle.bmp diff --git a/tests/auto/qimagereader/images/YCbCr_cmyk.jpg b/tests/auto/gui/image/qimagereader/images/YCbCr_cmyk.jpg similarity index 100% rename from tests/auto/qimagereader/images/YCbCr_cmyk.jpg rename to tests/auto/gui/image/qimagereader/images/YCbCr_cmyk.jpg diff --git a/tests/auto/qimagereader/images/YCbCr_cmyk.png b/tests/auto/gui/image/qimagereader/images/YCbCr_cmyk.png similarity index 100% rename from tests/auto/qimagereader/images/YCbCr_cmyk.png rename to tests/auto/gui/image/qimagereader/images/YCbCr_cmyk.png diff --git a/tests/auto/qimagereader/images/YCbCr_rgb.jpg b/tests/auto/gui/image/qimagereader/images/YCbCr_rgb.jpg similarity index 100% rename from tests/auto/qimagereader/images/YCbCr_rgb.jpg rename to tests/auto/gui/image/qimagereader/images/YCbCr_rgb.jpg diff --git a/tests/auto/qimagereader/images/away.png b/tests/auto/gui/image/qimagereader/images/away.png similarity index 100% rename from tests/auto/qimagereader/images/away.png rename to tests/auto/gui/image/qimagereader/images/away.png diff --git a/tests/auto/qimagereader/images/ball.mng b/tests/auto/gui/image/qimagereader/images/ball.mng similarity index 100% rename from tests/auto/qimagereader/images/ball.mng rename to tests/auto/gui/image/qimagereader/images/ball.mng diff --git a/tests/auto/qimagereader/images/bat1.gif b/tests/auto/gui/image/qimagereader/images/bat1.gif similarity index 100% rename from tests/auto/qimagereader/images/bat1.gif rename to tests/auto/gui/image/qimagereader/images/bat1.gif diff --git a/tests/auto/qimagereader/images/bat2.gif b/tests/auto/gui/image/qimagereader/images/bat2.gif similarity index 100% rename from tests/auto/qimagereader/images/bat2.gif rename to tests/auto/gui/image/qimagereader/images/bat2.gif diff --git a/tests/auto/qimagereader/images/beavis.jpg b/tests/auto/gui/image/qimagereader/images/beavis.jpg similarity index 100% rename from tests/auto/qimagereader/images/beavis.jpg rename to tests/auto/gui/image/qimagereader/images/beavis.jpg diff --git a/tests/auto/qimagereader/images/black.png b/tests/auto/gui/image/qimagereader/images/black.png similarity index 100% rename from tests/auto/qimagereader/images/black.png rename to tests/auto/gui/image/qimagereader/images/black.png diff --git a/tests/auto/qimagereader/images/black.xpm b/tests/auto/gui/image/qimagereader/images/black.xpm similarity index 100% rename from tests/auto/qimagereader/images/black.xpm rename to tests/auto/gui/image/qimagereader/images/black.xpm diff --git a/tests/auto/qimagereader/images/colorful.bmp b/tests/auto/gui/image/qimagereader/images/colorful.bmp similarity index 100% rename from tests/auto/qimagereader/images/colorful.bmp rename to tests/auto/gui/image/qimagereader/images/colorful.bmp diff --git a/tests/auto/qimagereader/images/corrupt-colors.xpm b/tests/auto/gui/image/qimagereader/images/corrupt-colors.xpm similarity index 100% rename from tests/auto/qimagereader/images/corrupt-colors.xpm rename to tests/auto/gui/image/qimagereader/images/corrupt-colors.xpm diff --git a/tests/auto/qimagereader/images/corrupt-data.tif b/tests/auto/gui/image/qimagereader/images/corrupt-data.tif similarity index 100% rename from tests/auto/qimagereader/images/corrupt-data.tif rename to tests/auto/gui/image/qimagereader/images/corrupt-data.tif diff --git a/tests/auto/qimagereader/images/corrupt-pixel-count.xpm b/tests/auto/gui/image/qimagereader/images/corrupt-pixel-count.xpm similarity index 100% rename from tests/auto/qimagereader/images/corrupt-pixel-count.xpm rename to tests/auto/gui/image/qimagereader/images/corrupt-pixel-count.xpm diff --git a/tests/auto/qimagereader/images/corrupt-pixels.xpm b/tests/auto/gui/image/qimagereader/images/corrupt-pixels.xpm similarity index 100% rename from tests/auto/qimagereader/images/corrupt-pixels.xpm rename to tests/auto/gui/image/qimagereader/images/corrupt-pixels.xpm diff --git a/tests/auto/qimagereader/images/corrupt.bmp b/tests/auto/gui/image/qimagereader/images/corrupt.bmp similarity index 100% rename from tests/auto/qimagereader/images/corrupt.bmp rename to tests/auto/gui/image/qimagereader/images/corrupt.bmp diff --git a/tests/auto/qimagereader/images/corrupt.gif b/tests/auto/gui/image/qimagereader/images/corrupt.gif similarity index 100% rename from tests/auto/qimagereader/images/corrupt.gif rename to tests/auto/gui/image/qimagereader/images/corrupt.gif diff --git a/tests/auto/qimagereader/images/corrupt.jpg b/tests/auto/gui/image/qimagereader/images/corrupt.jpg similarity index 100% rename from tests/auto/qimagereader/images/corrupt.jpg rename to tests/auto/gui/image/qimagereader/images/corrupt.jpg diff --git a/tests/auto/qimagereader/images/corrupt.mng b/tests/auto/gui/image/qimagereader/images/corrupt.mng similarity index 100% rename from tests/auto/qimagereader/images/corrupt.mng rename to tests/auto/gui/image/qimagereader/images/corrupt.mng diff --git a/tests/auto/qimagereader/images/corrupt.png b/tests/auto/gui/image/qimagereader/images/corrupt.png similarity index 100% rename from tests/auto/qimagereader/images/corrupt.png rename to tests/auto/gui/image/qimagereader/images/corrupt.png diff --git a/tests/auto/qimagereader/images/corrupt.svg b/tests/auto/gui/image/qimagereader/images/corrupt.svg similarity index 100% rename from tests/auto/qimagereader/images/corrupt.svg rename to tests/auto/gui/image/qimagereader/images/corrupt.svg diff --git a/tests/auto/qimagereader/images/corrupt.svgz b/tests/auto/gui/image/qimagereader/images/corrupt.svgz similarity index 100% rename from tests/auto/qimagereader/images/corrupt.svgz rename to tests/auto/gui/image/qimagereader/images/corrupt.svgz diff --git a/tests/auto/qimagereader/images/corrupt.xbm b/tests/auto/gui/image/qimagereader/images/corrupt.xbm similarity index 100% rename from tests/auto/qimagereader/images/corrupt.xbm rename to tests/auto/gui/image/qimagereader/images/corrupt.xbm diff --git a/tests/auto/qimagereader/images/crash-signed-char.bmp b/tests/auto/gui/image/qimagereader/images/crash-signed-char.bmp similarity index 100% rename from tests/auto/qimagereader/images/crash-signed-char.bmp rename to tests/auto/gui/image/qimagereader/images/crash-signed-char.bmp diff --git a/tests/auto/qimagereader/images/earth.gif b/tests/auto/gui/image/qimagereader/images/earth.gif similarity index 100% rename from tests/auto/qimagereader/images/earth.gif rename to tests/auto/gui/image/qimagereader/images/earth.gif diff --git a/tests/auto/qimagereader/images/endless-anim.gif b/tests/auto/gui/image/qimagereader/images/endless-anim.gif similarity index 100% rename from tests/auto/qimagereader/images/endless-anim.gif rename to tests/auto/gui/image/qimagereader/images/endless-anim.gif diff --git a/tests/auto/qimagereader/images/fire.mng b/tests/auto/gui/image/qimagereader/images/fire.mng similarity index 100% rename from tests/auto/qimagereader/images/fire.mng rename to tests/auto/gui/image/qimagereader/images/fire.mng diff --git a/tests/auto/qimagereader/images/font.bmp b/tests/auto/gui/image/qimagereader/images/font.bmp similarity index 100% rename from tests/auto/qimagereader/images/font.bmp rename to tests/auto/gui/image/qimagereader/images/font.bmp diff --git a/tests/auto/qimagereader/images/four-frames.gif b/tests/auto/gui/image/qimagereader/images/four-frames.gif similarity index 100% rename from tests/auto/qimagereader/images/four-frames.gif rename to tests/auto/gui/image/qimagereader/images/four-frames.gif diff --git a/tests/auto/qimagereader/images/gnus.xbm b/tests/auto/gui/image/qimagereader/images/gnus.xbm similarity index 100% rename from tests/auto/qimagereader/images/gnus.xbm rename to tests/auto/gui/image/qimagereader/images/gnus.xbm diff --git a/tests/auto/qimagereader/images/grayscale-ref.tif b/tests/auto/gui/image/qimagereader/images/grayscale-ref.tif similarity index 100% rename from tests/auto/qimagereader/images/grayscale-ref.tif rename to tests/auto/gui/image/qimagereader/images/grayscale-ref.tif diff --git a/tests/auto/qimagereader/images/grayscale.tif b/tests/auto/gui/image/qimagereader/images/grayscale.tif similarity index 100% rename from tests/auto/qimagereader/images/grayscale.tif rename to tests/auto/gui/image/qimagereader/images/grayscale.tif diff --git a/tests/auto/qimagereader/images/image.pbm b/tests/auto/gui/image/qimagereader/images/image.pbm similarity index 100% rename from tests/auto/qimagereader/images/image.pbm rename to tests/auto/gui/image/qimagereader/images/image.pbm diff --git a/tests/auto/qimagereader/images/image.pgm b/tests/auto/gui/image/qimagereader/images/image.pgm similarity index 100% rename from tests/auto/qimagereader/images/image.pgm rename to tests/auto/gui/image/qimagereader/images/image.pgm diff --git a/tests/auto/qimagereader/images/image.png b/tests/auto/gui/image/qimagereader/images/image.png similarity index 100% rename from tests/auto/qimagereader/images/image.png rename to tests/auto/gui/image/qimagereader/images/image.png diff --git a/tests/auto/qimagereader/images/image.ppm b/tests/auto/gui/image/qimagereader/images/image.ppm similarity index 100% rename from tests/auto/qimagereader/images/image.ppm rename to tests/auto/gui/image/qimagereader/images/image.ppm diff --git a/tests/auto/qimagereader/images/image_100dpi.tif b/tests/auto/gui/image/qimagereader/images/image_100dpi.tif similarity index 100% rename from tests/auto/qimagereader/images/image_100dpi.tif rename to tests/auto/gui/image/qimagereader/images/image_100dpi.tif diff --git a/tests/auto/qimagereader/images/kollada-noext b/tests/auto/gui/image/qimagereader/images/kollada-noext similarity index 100% rename from tests/auto/qimagereader/images/kollada-noext rename to tests/auto/gui/image/qimagereader/images/kollada-noext diff --git a/tests/auto/qimagereader/images/kollada.png b/tests/auto/gui/image/qimagereader/images/kollada.png similarity index 100% rename from tests/auto/qimagereader/images/kollada.png rename to tests/auto/gui/image/qimagereader/images/kollada.png diff --git a/tests/auto/qimagereader/images/marble.xpm b/tests/auto/gui/image/qimagereader/images/marble.xpm similarity index 100% rename from tests/auto/qimagereader/images/marble.xpm rename to tests/auto/gui/image/qimagereader/images/marble.xpm diff --git a/tests/auto/qimagereader/images/namedcolors.xpm b/tests/auto/gui/image/qimagereader/images/namedcolors.xpm similarity index 100% rename from tests/auto/qimagereader/images/namedcolors.xpm rename to tests/auto/gui/image/qimagereader/images/namedcolors.xpm diff --git a/tests/auto/qimagereader/images/negativeheight.bmp b/tests/auto/gui/image/qimagereader/images/negativeheight.bmp similarity index 100% rename from tests/auto/qimagereader/images/negativeheight.bmp rename to tests/auto/gui/image/qimagereader/images/negativeheight.bmp diff --git a/tests/auto/qimagereader/images/noclearcode.bmp b/tests/auto/gui/image/qimagereader/images/noclearcode.bmp similarity index 100% rename from tests/auto/qimagereader/images/noclearcode.bmp rename to tests/auto/gui/image/qimagereader/images/noclearcode.bmp diff --git a/tests/auto/qimagereader/images/noclearcode.gif b/tests/auto/gui/image/qimagereader/images/noclearcode.gif similarity index 100% rename from tests/auto/qimagereader/images/noclearcode.gif rename to tests/auto/gui/image/qimagereader/images/noclearcode.gif diff --git a/tests/auto/qimagereader/images/nontransparent.xpm b/tests/auto/gui/image/qimagereader/images/nontransparent.xpm similarity index 100% rename from tests/auto/qimagereader/images/nontransparent.xpm rename to tests/auto/gui/image/qimagereader/images/nontransparent.xpm diff --git a/tests/auto/qimagereader/images/qt-gif-anim.gif b/tests/auto/gui/image/qimagereader/images/qt-gif-anim.gif similarity index 100% rename from tests/auto/qimagereader/images/qt-gif-anim.gif rename to tests/auto/gui/image/qimagereader/images/qt-gif-anim.gif diff --git a/tests/auto/qimagereader/images/qt-gif-noanim.gif b/tests/auto/gui/image/qimagereader/images/qt-gif-noanim.gif similarity index 100% rename from tests/auto/qimagereader/images/qt-gif-noanim.gif rename to tests/auto/gui/image/qimagereader/images/qt-gif-noanim.gif diff --git a/tests/auto/qimagereader/images/qt.gif b/tests/auto/gui/image/qimagereader/images/qt.gif similarity index 100% rename from tests/auto/qimagereader/images/qt.gif rename to tests/auto/gui/image/qimagereader/images/qt.gif diff --git a/tests/auto/qimagereader/images/qt1.gif b/tests/auto/gui/image/qimagereader/images/qt1.gif similarity index 100% rename from tests/auto/qimagereader/images/qt1.gif rename to tests/auto/gui/image/qimagereader/images/qt1.gif diff --git a/tests/auto/qimagereader/images/qt2.gif b/tests/auto/gui/image/qimagereader/images/qt2.gif similarity index 100% rename from tests/auto/qimagereader/images/qt2.gif rename to tests/auto/gui/image/qimagereader/images/qt2.gif diff --git a/tests/auto/qimagereader/images/qt3.gif b/tests/auto/gui/image/qimagereader/images/qt3.gif similarity index 100% rename from tests/auto/qimagereader/images/qt3.gif rename to tests/auto/gui/image/qimagereader/images/qt3.gif diff --git a/tests/auto/qimagereader/images/qt4.gif b/tests/auto/gui/image/qimagereader/images/qt4.gif similarity index 100% rename from tests/auto/qimagereader/images/qt4.gif rename to tests/auto/gui/image/qimagereader/images/qt4.gif diff --git a/tests/auto/qimagereader/images/qt5.gif b/tests/auto/gui/image/qimagereader/images/qt5.gif similarity index 100% rename from tests/auto/qimagereader/images/qt5.gif rename to tests/auto/gui/image/qimagereader/images/qt5.gif diff --git a/tests/auto/qimagereader/images/qt6.gif b/tests/auto/gui/image/qimagereader/images/qt6.gif similarity index 100% rename from tests/auto/qimagereader/images/qt6.gif rename to tests/auto/gui/image/qimagereader/images/qt6.gif diff --git a/tests/auto/qimagereader/images/qt7.gif b/tests/auto/gui/image/qimagereader/images/qt7.gif similarity index 100% rename from tests/auto/qimagereader/images/qt7.gif rename to tests/auto/gui/image/qimagereader/images/qt7.gif diff --git a/tests/auto/qimagereader/images/qt8.gif b/tests/auto/gui/image/qimagereader/images/qt8.gif similarity index 100% rename from tests/auto/qimagereader/images/qt8.gif rename to tests/auto/gui/image/qimagereader/images/qt8.gif diff --git a/tests/auto/qimagereader/images/qtbug13653-no_eoi.jpg b/tests/auto/gui/image/qimagereader/images/qtbug13653-no_eoi.jpg similarity index 100% rename from tests/auto/qimagereader/images/qtbug13653-no_eoi.jpg rename to tests/auto/gui/image/qimagereader/images/qtbug13653-no_eoi.jpg diff --git a/tests/auto/qimagereader/images/rect.svg b/tests/auto/gui/image/qimagereader/images/rect.svg similarity index 100% rename from tests/auto/qimagereader/images/rect.svg rename to tests/auto/gui/image/qimagereader/images/rect.svg diff --git a/tests/auto/qimagereader/images/rect.svgz b/tests/auto/gui/image/qimagereader/images/rect.svgz similarity index 100% rename from tests/auto/qimagereader/images/rect.svgz rename to tests/auto/gui/image/qimagereader/images/rect.svgz diff --git a/tests/auto/qimagereader/images/rgba_adobedeflate_littleendian.tif b/tests/auto/gui/image/qimagereader/images/rgba_adobedeflate_littleendian.tif similarity index 100% rename from tests/auto/qimagereader/images/rgba_adobedeflate_littleendian.tif rename to tests/auto/gui/image/qimagereader/images/rgba_adobedeflate_littleendian.tif diff --git a/tests/auto/qimagereader/images/rgba_lzw_littleendian.tif b/tests/auto/gui/image/qimagereader/images/rgba_lzw_littleendian.tif similarity index 100% rename from tests/auto/qimagereader/images/rgba_lzw_littleendian.tif rename to tests/auto/gui/image/qimagereader/images/rgba_lzw_littleendian.tif diff --git a/tests/auto/qimagereader/images/rgba_nocompression_bigendian.tif b/tests/auto/gui/image/qimagereader/images/rgba_nocompression_bigendian.tif similarity index 100% rename from tests/auto/qimagereader/images/rgba_nocompression_bigendian.tif rename to tests/auto/gui/image/qimagereader/images/rgba_nocompression_bigendian.tif diff --git a/tests/auto/qimagereader/images/rgba_nocompression_littleendian.tif b/tests/auto/gui/image/qimagereader/images/rgba_nocompression_littleendian.tif similarity index 100% rename from tests/auto/qimagereader/images/rgba_nocompression_littleendian.tif rename to tests/auto/gui/image/qimagereader/images/rgba_nocompression_littleendian.tif diff --git a/tests/auto/qimagereader/images/rgba_packbits_littleendian.tif b/tests/auto/gui/image/qimagereader/images/rgba_packbits_littleendian.tif similarity index 100% rename from tests/auto/qimagereader/images/rgba_packbits_littleendian.tif rename to tests/auto/gui/image/qimagereader/images/rgba_packbits_littleendian.tif diff --git a/tests/auto/qimagereader/images/rgba_zipdeflate_littleendian.tif b/tests/auto/gui/image/qimagereader/images/rgba_zipdeflate_littleendian.tif similarity index 100% rename from tests/auto/qimagereader/images/rgba_zipdeflate_littleendian.tif rename to tests/auto/gui/image/qimagereader/images/rgba_zipdeflate_littleendian.tif diff --git a/tests/auto/qimagereader/images/runners.ppm b/tests/auto/gui/image/qimagereader/images/runners.ppm similarity index 100% rename from tests/auto/qimagereader/images/runners.ppm rename to tests/auto/gui/image/qimagereader/images/runners.ppm diff --git a/tests/auto/qimagereader/images/teapot.ppm b/tests/auto/gui/image/qimagereader/images/teapot.ppm similarity index 100% rename from tests/auto/qimagereader/images/teapot.ppm rename to tests/auto/gui/image/qimagereader/images/teapot.ppm diff --git a/tests/auto/qimagereader/images/test.ppm b/tests/auto/gui/image/qimagereader/images/test.ppm similarity index 100% rename from tests/auto/qimagereader/images/test.ppm rename to tests/auto/gui/image/qimagereader/images/test.ppm diff --git a/tests/auto/qimagereader/images/test.xpm b/tests/auto/gui/image/qimagereader/images/test.xpm similarity index 100% rename from tests/auto/qimagereader/images/test.xpm rename to tests/auto/gui/image/qimagereader/images/test.xpm diff --git a/tests/auto/qimagereader/images/test32bfv4.bmp b/tests/auto/gui/image/qimagereader/images/test32bfv4.bmp similarity index 100% rename from tests/auto/qimagereader/images/test32bfv4.bmp rename to tests/auto/gui/image/qimagereader/images/test32bfv4.bmp diff --git a/tests/auto/qimagereader/images/test32v5.bmp b/tests/auto/gui/image/qimagereader/images/test32v5.bmp similarity index 100% rename from tests/auto/qimagereader/images/test32v5.bmp rename to tests/auto/gui/image/qimagereader/images/test32v5.bmp diff --git a/tests/auto/qimagereader/images/tiff_oriented/indexed_orientation_1.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/indexed_orientation_1.tiff similarity index 100% rename from tests/auto/qimagereader/images/tiff_oriented/indexed_orientation_1.tiff rename to tests/auto/gui/image/qimagereader/images/tiff_oriented/indexed_orientation_1.tiff diff --git a/tests/auto/qimagereader/images/tiff_oriented/indexed_orientation_2.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/indexed_orientation_2.tiff similarity index 100% rename from tests/auto/qimagereader/images/tiff_oriented/indexed_orientation_2.tiff rename to tests/auto/gui/image/qimagereader/images/tiff_oriented/indexed_orientation_2.tiff diff --git a/tests/auto/qimagereader/images/tiff_oriented/indexed_orientation_3.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/indexed_orientation_3.tiff similarity index 100% rename from tests/auto/qimagereader/images/tiff_oriented/indexed_orientation_3.tiff rename to tests/auto/gui/image/qimagereader/images/tiff_oriented/indexed_orientation_3.tiff diff --git a/tests/auto/qimagereader/images/tiff_oriented/indexed_orientation_4.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/indexed_orientation_4.tiff similarity index 100% rename from tests/auto/qimagereader/images/tiff_oriented/indexed_orientation_4.tiff rename to tests/auto/gui/image/qimagereader/images/tiff_oriented/indexed_orientation_4.tiff diff --git a/tests/auto/qimagereader/images/tiff_oriented/indexed_orientation_5.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/indexed_orientation_5.tiff similarity index 100% rename from tests/auto/qimagereader/images/tiff_oriented/indexed_orientation_5.tiff rename to tests/auto/gui/image/qimagereader/images/tiff_oriented/indexed_orientation_5.tiff diff --git a/tests/auto/qimagereader/images/tiff_oriented/indexed_orientation_6.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/indexed_orientation_6.tiff similarity index 100% rename from tests/auto/qimagereader/images/tiff_oriented/indexed_orientation_6.tiff rename to tests/auto/gui/image/qimagereader/images/tiff_oriented/indexed_orientation_6.tiff diff --git a/tests/auto/qimagereader/images/tiff_oriented/indexed_orientation_7.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/indexed_orientation_7.tiff similarity index 100% rename from tests/auto/qimagereader/images/tiff_oriented/indexed_orientation_7.tiff rename to tests/auto/gui/image/qimagereader/images/tiff_oriented/indexed_orientation_7.tiff diff --git a/tests/auto/qimagereader/images/tiff_oriented/indexed_orientation_8.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/indexed_orientation_8.tiff similarity index 100% rename from tests/auto/qimagereader/images/tiff_oriented/indexed_orientation_8.tiff rename to tests/auto/gui/image/qimagereader/images/tiff_oriented/indexed_orientation_8.tiff diff --git a/tests/auto/qimagereader/images/tiff_oriented/mono_orientation_1.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/mono_orientation_1.tiff similarity index 100% rename from tests/auto/qimagereader/images/tiff_oriented/mono_orientation_1.tiff rename to tests/auto/gui/image/qimagereader/images/tiff_oriented/mono_orientation_1.tiff diff --git a/tests/auto/qimagereader/images/tiff_oriented/mono_orientation_2.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/mono_orientation_2.tiff similarity index 100% rename from tests/auto/qimagereader/images/tiff_oriented/mono_orientation_2.tiff rename to tests/auto/gui/image/qimagereader/images/tiff_oriented/mono_orientation_2.tiff diff --git a/tests/auto/qimagereader/images/tiff_oriented/mono_orientation_3.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/mono_orientation_3.tiff similarity index 100% rename from tests/auto/qimagereader/images/tiff_oriented/mono_orientation_3.tiff rename to tests/auto/gui/image/qimagereader/images/tiff_oriented/mono_orientation_3.tiff diff --git a/tests/auto/qimagereader/images/tiff_oriented/mono_orientation_4.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/mono_orientation_4.tiff similarity index 100% rename from tests/auto/qimagereader/images/tiff_oriented/mono_orientation_4.tiff rename to tests/auto/gui/image/qimagereader/images/tiff_oriented/mono_orientation_4.tiff diff --git a/tests/auto/qimagereader/images/tiff_oriented/mono_orientation_5.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/mono_orientation_5.tiff similarity index 100% rename from tests/auto/qimagereader/images/tiff_oriented/mono_orientation_5.tiff rename to tests/auto/gui/image/qimagereader/images/tiff_oriented/mono_orientation_5.tiff diff --git a/tests/auto/qimagereader/images/tiff_oriented/mono_orientation_6.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/mono_orientation_6.tiff similarity index 100% rename from tests/auto/qimagereader/images/tiff_oriented/mono_orientation_6.tiff rename to tests/auto/gui/image/qimagereader/images/tiff_oriented/mono_orientation_6.tiff diff --git a/tests/auto/qimagereader/images/tiff_oriented/mono_orientation_7.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/mono_orientation_7.tiff similarity index 100% rename from tests/auto/qimagereader/images/tiff_oriented/mono_orientation_7.tiff rename to tests/auto/gui/image/qimagereader/images/tiff_oriented/mono_orientation_7.tiff diff --git a/tests/auto/qimagereader/images/tiff_oriented/mono_orientation_8.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/mono_orientation_8.tiff similarity index 100% rename from tests/auto/qimagereader/images/tiff_oriented/mono_orientation_8.tiff rename to tests/auto/gui/image/qimagereader/images/tiff_oriented/mono_orientation_8.tiff diff --git a/tests/auto/qimagereader/images/tiff_oriented/original_indexed.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/original_indexed.tiff similarity index 100% rename from tests/auto/qimagereader/images/tiff_oriented/original_indexed.tiff rename to tests/auto/gui/image/qimagereader/images/tiff_oriented/original_indexed.tiff diff --git a/tests/auto/qimagereader/images/tiff_oriented/original_mono.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/original_mono.tiff similarity index 100% rename from tests/auto/qimagereader/images/tiff_oriented/original_mono.tiff rename to tests/auto/gui/image/qimagereader/images/tiff_oriented/original_mono.tiff diff --git a/tests/auto/qimagereader/images/tiff_oriented/original_rgb.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/original_rgb.tiff similarity index 100% rename from tests/auto/qimagereader/images/tiff_oriented/original_rgb.tiff rename to tests/auto/gui/image/qimagereader/images/tiff_oriented/original_rgb.tiff diff --git a/tests/auto/qimagereader/images/tiff_oriented/rgb_orientation_1.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/rgb_orientation_1.tiff similarity index 100% rename from tests/auto/qimagereader/images/tiff_oriented/rgb_orientation_1.tiff rename to tests/auto/gui/image/qimagereader/images/tiff_oriented/rgb_orientation_1.tiff diff --git a/tests/auto/qimagereader/images/tiff_oriented/rgb_orientation_2.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/rgb_orientation_2.tiff similarity index 100% rename from tests/auto/qimagereader/images/tiff_oriented/rgb_orientation_2.tiff rename to tests/auto/gui/image/qimagereader/images/tiff_oriented/rgb_orientation_2.tiff diff --git a/tests/auto/qimagereader/images/tiff_oriented/rgb_orientation_3.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/rgb_orientation_3.tiff similarity index 100% rename from tests/auto/qimagereader/images/tiff_oriented/rgb_orientation_3.tiff rename to tests/auto/gui/image/qimagereader/images/tiff_oriented/rgb_orientation_3.tiff diff --git a/tests/auto/qimagereader/images/tiff_oriented/rgb_orientation_4.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/rgb_orientation_4.tiff similarity index 100% rename from tests/auto/qimagereader/images/tiff_oriented/rgb_orientation_4.tiff rename to tests/auto/gui/image/qimagereader/images/tiff_oriented/rgb_orientation_4.tiff diff --git a/tests/auto/qimagereader/images/tiff_oriented/rgb_orientation_5.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/rgb_orientation_5.tiff similarity index 100% rename from tests/auto/qimagereader/images/tiff_oriented/rgb_orientation_5.tiff rename to tests/auto/gui/image/qimagereader/images/tiff_oriented/rgb_orientation_5.tiff diff --git a/tests/auto/qimagereader/images/tiff_oriented/rgb_orientation_6.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/rgb_orientation_6.tiff similarity index 100% rename from tests/auto/qimagereader/images/tiff_oriented/rgb_orientation_6.tiff rename to tests/auto/gui/image/qimagereader/images/tiff_oriented/rgb_orientation_6.tiff diff --git a/tests/auto/qimagereader/images/tiff_oriented/rgb_orientation_7.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/rgb_orientation_7.tiff similarity index 100% rename from tests/auto/qimagereader/images/tiff_oriented/rgb_orientation_7.tiff rename to tests/auto/gui/image/qimagereader/images/tiff_oriented/rgb_orientation_7.tiff diff --git a/tests/auto/qimagereader/images/tiff_oriented/rgb_orientation_8.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/rgb_orientation_8.tiff similarity index 100% rename from tests/auto/qimagereader/images/tiff_oriented/rgb_orientation_8.tiff rename to tests/auto/gui/image/qimagereader/images/tiff_oriented/rgb_orientation_8.tiff diff --git a/tests/auto/qimagereader/images/transparent.xpm b/tests/auto/gui/image/qimagereader/images/transparent.xpm similarity index 100% rename from tests/auto/qimagereader/images/transparent.xpm rename to tests/auto/gui/image/qimagereader/images/transparent.xpm diff --git a/tests/auto/qimagereader/images/trolltech.gif b/tests/auto/gui/image/qimagereader/images/trolltech.gif similarity index 100% rename from tests/auto/qimagereader/images/trolltech.gif rename to tests/auto/gui/image/qimagereader/images/trolltech.gif diff --git a/tests/auto/qimagereader/images/tst7.bmp b/tests/auto/gui/image/qimagereader/images/tst7.bmp similarity index 100% rename from tests/auto/qimagereader/images/tst7.bmp rename to tests/auto/gui/image/qimagereader/images/tst7.bmp diff --git a/tests/auto/qimagereader/images/tst7.png b/tests/auto/gui/image/qimagereader/images/tst7.png similarity index 100% rename from tests/auto/qimagereader/images/tst7.png rename to tests/auto/gui/image/qimagereader/images/tst7.png diff --git a/tests/auto/qimagereader/images/txts.png b/tests/auto/gui/image/qimagereader/images/txts.png similarity index 100% rename from tests/auto/qimagereader/images/txts.png rename to tests/auto/gui/image/qimagereader/images/txts.png diff --git a/tests/auto/qimagereader/qimagereader.pro b/tests/auto/gui/image/qimagereader/qimagereader.pro similarity index 100% rename from tests/auto/qimagereader/qimagereader.pro rename to tests/auto/gui/image/qimagereader/qimagereader.pro diff --git a/tests/auto/qimagereader/qimagereader.qrc b/tests/auto/gui/image/qimagereader/qimagereader.qrc similarity index 100% rename from tests/auto/qimagereader/qimagereader.qrc rename to tests/auto/gui/image/qimagereader/qimagereader.qrc diff --git a/tests/auto/qimagereader/tst_qimagereader.cpp b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp similarity index 99% rename from tests/auto/qimagereader/tst_qimagereader.cpp rename to tests/auto/gui/image/qimagereader/tst_qimagereader.cpp index 63594685972..ffedc69a7f7 100644 --- a/tests/auto/qimagereader/tst_qimagereader.cpp +++ b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp @@ -55,7 +55,7 @@ #include #include -#include "../platformquirks.h" +#include "../../../platformquirks.h" #if defined(Q_OS_SYMBIAN) # define SRCDIR "." diff --git a/tests/auto/qimagewriter/.gitignore b/tests/auto/gui/image/qimagewriter/.gitignore similarity index 100% rename from tests/auto/qimagewriter/.gitignore rename to tests/auto/gui/image/qimagewriter/.gitignore diff --git a/tests/auto/qimagewriter/images/YCbCr_cmyk.jpg b/tests/auto/gui/image/qimagewriter/images/YCbCr_cmyk.jpg similarity index 100% rename from tests/auto/qimagewriter/images/YCbCr_cmyk.jpg rename to tests/auto/gui/image/qimagewriter/images/YCbCr_cmyk.jpg diff --git a/tests/auto/qimagewriter/images/YCbCr_rgb.jpg b/tests/auto/gui/image/qimagewriter/images/YCbCr_rgb.jpg similarity index 100% rename from tests/auto/qimagewriter/images/YCbCr_rgb.jpg rename to tests/auto/gui/image/qimagewriter/images/YCbCr_rgb.jpg diff --git a/tests/auto/qimagewriter/images/beavis.jpg b/tests/auto/gui/image/qimagewriter/images/beavis.jpg similarity index 100% rename from tests/auto/qimagewriter/images/beavis.jpg rename to tests/auto/gui/image/qimagewriter/images/beavis.jpg diff --git a/tests/auto/qimagewriter/images/colorful.bmp b/tests/auto/gui/image/qimagewriter/images/colorful.bmp similarity index 100% rename from tests/auto/qimagewriter/images/colorful.bmp rename to tests/auto/gui/image/qimagewriter/images/colorful.bmp diff --git a/tests/auto/qimagewriter/images/earth.gif b/tests/auto/gui/image/qimagewriter/images/earth.gif similarity index 100% rename from tests/auto/qimagewriter/images/earth.gif rename to tests/auto/gui/image/qimagewriter/images/earth.gif diff --git a/tests/auto/qimagewriter/images/font.bmp b/tests/auto/gui/image/qimagewriter/images/font.bmp similarity index 100% rename from tests/auto/qimagewriter/images/font.bmp rename to tests/auto/gui/image/qimagewriter/images/font.bmp diff --git a/tests/auto/qimagewriter/images/gnus.xbm b/tests/auto/gui/image/qimagewriter/images/gnus.xbm similarity index 100% rename from tests/auto/qimagewriter/images/gnus.xbm rename to tests/auto/gui/image/qimagewriter/images/gnus.xbm diff --git a/tests/auto/qimagewriter/images/kollada.png b/tests/auto/gui/image/qimagewriter/images/kollada.png similarity index 100% rename from tests/auto/qimagewriter/images/kollada.png rename to tests/auto/gui/image/qimagewriter/images/kollada.png diff --git a/tests/auto/qimagewriter/images/marble.xpm b/tests/auto/gui/image/qimagewriter/images/marble.xpm similarity index 100% rename from tests/auto/qimagewriter/images/marble.xpm rename to tests/auto/gui/image/qimagewriter/images/marble.xpm diff --git a/tests/auto/qimagewriter/images/ship63.pbm b/tests/auto/gui/image/qimagewriter/images/ship63.pbm similarity index 100% rename from tests/auto/qimagewriter/images/ship63.pbm rename to tests/auto/gui/image/qimagewriter/images/ship63.pbm diff --git a/tests/auto/qimagewriter/images/teapot.ppm b/tests/auto/gui/image/qimagewriter/images/teapot.ppm similarity index 100% rename from tests/auto/qimagewriter/images/teapot.ppm rename to tests/auto/gui/image/qimagewriter/images/teapot.ppm diff --git a/tests/auto/qimagewriter/images/teapot.tiff b/tests/auto/gui/image/qimagewriter/images/teapot.tiff similarity index 100% rename from tests/auto/qimagewriter/images/teapot.tiff rename to tests/auto/gui/image/qimagewriter/images/teapot.tiff diff --git a/tests/auto/qimagewriter/images/trolltech.gif b/tests/auto/gui/image/qimagewriter/images/trolltech.gif similarity index 100% rename from tests/auto/qimagewriter/images/trolltech.gif rename to tests/auto/gui/image/qimagewriter/images/trolltech.gif diff --git a/tests/auto/qimagewriter/qimagewriter.pro b/tests/auto/gui/image/qimagewriter/qimagewriter.pro similarity index 100% rename from tests/auto/qimagewriter/qimagewriter.pro rename to tests/auto/gui/image/qimagewriter/qimagewriter.pro diff --git a/tests/auto/qimagewriter/tst_qimagewriter.cpp b/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp similarity index 100% rename from tests/auto/qimagewriter/tst_qimagewriter.cpp rename to tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp diff --git a/tests/auto/qmovie/.gitignore b/tests/auto/gui/image/qmovie/.gitignore similarity index 100% rename from tests/auto/qmovie/.gitignore rename to tests/auto/gui/image/qmovie/.gitignore diff --git a/tests/auto/qmovie/animations/comicsecard.gif b/tests/auto/gui/image/qmovie/animations/comicsecard.gif similarity index 100% rename from tests/auto/qmovie/animations/comicsecard.gif rename to tests/auto/gui/image/qmovie/animations/comicsecard.gif diff --git a/tests/auto/qmovie/animations/corrupt.gif b/tests/auto/gui/image/qmovie/animations/corrupt.gif similarity index 100% rename from tests/auto/qmovie/animations/corrupt.gif rename to tests/auto/gui/image/qmovie/animations/corrupt.gif diff --git a/tests/auto/qmovie/animations/dutch.mng b/tests/auto/gui/image/qmovie/animations/dutch.mng similarity index 100% rename from tests/auto/qmovie/animations/dutch.mng rename to tests/auto/gui/image/qmovie/animations/dutch.mng diff --git a/tests/auto/qmovie/animations/trolltech.gif b/tests/auto/gui/image/qmovie/animations/trolltech.gif similarity index 100% rename from tests/auto/qmovie/animations/trolltech.gif rename to tests/auto/gui/image/qmovie/animations/trolltech.gif diff --git a/tests/auto/qmovie/qmovie.pro b/tests/auto/gui/image/qmovie/qmovie.pro similarity index 100% rename from tests/auto/qmovie/qmovie.pro rename to tests/auto/gui/image/qmovie/qmovie.pro diff --git a/tests/auto/qmovie/resources.qrc b/tests/auto/gui/image/qmovie/resources.qrc similarity index 100% rename from tests/auto/qmovie/resources.qrc rename to tests/auto/gui/image/qmovie/resources.qrc diff --git a/tests/auto/qmovie/tst_qmovie.cpp b/tests/auto/gui/image/qmovie/tst_qmovie.cpp similarity index 100% rename from tests/auto/qmovie/tst_qmovie.cpp rename to tests/auto/gui/image/qmovie/tst_qmovie.cpp diff --git a/tests/auto/qpicture/.gitignore b/tests/auto/gui/image/qpicture/.gitignore similarity index 100% rename from tests/auto/qpicture/.gitignore rename to tests/auto/gui/image/qpicture/.gitignore diff --git a/tests/auto/qpicture/qpicture.pro b/tests/auto/gui/image/qpicture/qpicture.pro similarity index 100% rename from tests/auto/qpicture/qpicture.pro rename to tests/auto/gui/image/qpicture/qpicture.pro diff --git a/tests/auto/qpicture/tst_qpicture.cpp b/tests/auto/gui/image/qpicture/tst_qpicture.cpp similarity index 100% rename from tests/auto/qpicture/tst_qpicture.cpp rename to tests/auto/gui/image/qpicture/tst_qpicture.cpp diff --git a/tests/auto/qpixmap/.gitignore b/tests/auto/gui/image/qpixmap/.gitignore similarity index 100% rename from tests/auto/qpixmap/.gitignore rename to tests/auto/gui/image/qpixmap/.gitignore diff --git a/tests/auto/qpixmap/convertFromImage/task31722_0/img1.png b/tests/auto/gui/image/qpixmap/convertFromImage/task31722_0/img1.png similarity index 100% rename from tests/auto/qpixmap/convertFromImage/task31722_0/img1.png rename to tests/auto/gui/image/qpixmap/convertFromImage/task31722_0/img1.png diff --git a/tests/auto/qpixmap/convertFromImage/task31722_0/img2.png b/tests/auto/gui/image/qpixmap/convertFromImage/task31722_0/img2.png similarity index 100% rename from tests/auto/qpixmap/convertFromImage/task31722_0/img2.png rename to tests/auto/gui/image/qpixmap/convertFromImage/task31722_0/img2.png diff --git a/tests/auto/qpixmap/convertFromImage/task31722_1/img1.png b/tests/auto/gui/image/qpixmap/convertFromImage/task31722_1/img1.png similarity index 100% rename from tests/auto/qpixmap/convertFromImage/task31722_1/img1.png rename to tests/auto/gui/image/qpixmap/convertFromImage/task31722_1/img1.png diff --git a/tests/auto/qpixmap/convertFromImage/task31722_1/img2.png b/tests/auto/gui/image/qpixmap/convertFromImage/task31722_1/img2.png similarity index 100% rename from tests/auto/qpixmap/convertFromImage/task31722_1/img2.png rename to tests/auto/gui/image/qpixmap/convertFromImage/task31722_1/img2.png diff --git a/tests/auto/qpixmap/convertFromToHICON/icon_32bpp.ico b/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_32bpp.ico similarity index 100% rename from tests/auto/qpixmap/convertFromToHICON/icon_32bpp.ico rename to tests/auto/gui/image/qpixmap/convertFromToHICON/icon_32bpp.ico diff --git a/tests/auto/qpixmap/convertFromToHICON/icon_32bpp_16x16.png b/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_32bpp_16x16.png similarity index 100% rename from tests/auto/qpixmap/convertFromToHICON/icon_32bpp_16x16.png rename to tests/auto/gui/image/qpixmap/convertFromToHICON/icon_32bpp_16x16.png diff --git a/tests/auto/qpixmap/convertFromToHICON/icon_32bpp_256x256.png b/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_32bpp_256x256.png similarity index 100% rename from tests/auto/qpixmap/convertFromToHICON/icon_32bpp_256x256.png rename to tests/auto/gui/image/qpixmap/convertFromToHICON/icon_32bpp_256x256.png diff --git a/tests/auto/qpixmap/convertFromToHICON/icon_32bpp_32x32.png b/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_32bpp_32x32.png similarity index 100% rename from tests/auto/qpixmap/convertFromToHICON/icon_32bpp_32x32.png rename to tests/auto/gui/image/qpixmap/convertFromToHICON/icon_32bpp_32x32.png diff --git a/tests/auto/qpixmap/convertFromToHICON/icon_32bpp_48x48.png b/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_32bpp_48x48.png similarity index 100% rename from tests/auto/qpixmap/convertFromToHICON/icon_32bpp_48x48.png rename to tests/auto/gui/image/qpixmap/convertFromToHICON/icon_32bpp_48x48.png diff --git a/tests/auto/qpixmap/convertFromToHICON/icon_8bpp.ico b/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp.ico similarity index 100% rename from tests/auto/qpixmap/convertFromToHICON/icon_8bpp.ico rename to tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp.ico diff --git a/tests/auto/qpixmap/convertFromToHICON/icon_8bpp_16x16.png b/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp_16x16.png similarity index 100% rename from tests/auto/qpixmap/convertFromToHICON/icon_8bpp_16x16.png rename to tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp_16x16.png diff --git a/tests/auto/qpixmap/convertFromToHICON/icon_8bpp_32x32.png b/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp_32x32.png similarity index 100% rename from tests/auto/qpixmap/convertFromToHICON/icon_8bpp_32x32.png rename to tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp_32x32.png diff --git a/tests/auto/qpixmap/convertFromToHICON/icon_8bpp_48x48.png b/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp_48x48.png similarity index 100% rename from tests/auto/qpixmap/convertFromToHICON/icon_8bpp_48x48.png rename to tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp_48x48.png diff --git a/tests/auto/qpixmap/images/designer.png b/tests/auto/gui/image/qpixmap/images/designer.png similarity index 100% rename from tests/auto/qpixmap/images/designer.png rename to tests/auto/gui/image/qpixmap/images/designer.png diff --git a/tests/auto/qpixmap/images/dx_-10_dy_-10_50_50_100_100.png b/tests/auto/gui/image/qpixmap/images/dx_-10_dy_-10_50_50_100_100.png similarity index 100% rename from tests/auto/qpixmap/images/dx_-10_dy_-10_50_50_100_100.png rename to tests/auto/gui/image/qpixmap/images/dx_-10_dy_-10_50_50_100_100.png diff --git a/tests/auto/qpixmap/images/dx_-10_dy_-10_x_y_w_h.png b/tests/auto/gui/image/qpixmap/images/dx_-10_dy_-10_x_y_w_h.png similarity index 100% rename from tests/auto/qpixmap/images/dx_-10_dy_-10_x_y_w_h.png rename to tests/auto/gui/image/qpixmap/images/dx_-10_dy_-10_x_y_w_h.png diff --git a/tests/auto/qpixmap/images/dx_-10_dy_0_50_50_100_100.png b/tests/auto/gui/image/qpixmap/images/dx_-10_dy_0_50_50_100_100.png similarity index 100% rename from tests/auto/qpixmap/images/dx_-10_dy_0_50_50_100_100.png rename to tests/auto/gui/image/qpixmap/images/dx_-10_dy_0_50_50_100_100.png diff --git a/tests/auto/qpixmap/images/dx_-10_dy_0_x_y_w_h.png b/tests/auto/gui/image/qpixmap/images/dx_-10_dy_0_x_y_w_h.png similarity index 100% rename from tests/auto/qpixmap/images/dx_-10_dy_0_x_y_w_h.png rename to tests/auto/gui/image/qpixmap/images/dx_-10_dy_0_x_y_w_h.png diff --git a/tests/auto/qpixmap/images/dx_-128_dy_-128_x_y_w_h.png b/tests/auto/gui/image/qpixmap/images/dx_-128_dy_-128_x_y_w_h.png similarity index 100% rename from tests/auto/qpixmap/images/dx_-128_dy_-128_x_y_w_h.png rename to tests/auto/gui/image/qpixmap/images/dx_-128_dy_-128_x_y_w_h.png diff --git a/tests/auto/qpixmap/images/dx_-128_dy_0_x_y_w_h.png b/tests/auto/gui/image/qpixmap/images/dx_-128_dy_0_x_y_w_h.png similarity index 100% rename from tests/auto/qpixmap/images/dx_-128_dy_0_x_y_w_h.png rename to tests/auto/gui/image/qpixmap/images/dx_-128_dy_0_x_y_w_h.png diff --git a/tests/auto/qpixmap/images/dx_0_dy_-10_50_50_100_100.png b/tests/auto/gui/image/qpixmap/images/dx_0_dy_-10_50_50_100_100.png similarity index 100% rename from tests/auto/qpixmap/images/dx_0_dy_-10_50_50_100_100.png rename to tests/auto/gui/image/qpixmap/images/dx_0_dy_-10_50_50_100_100.png diff --git a/tests/auto/qpixmap/images/dx_0_dy_-10_x_y_w_h.png b/tests/auto/gui/image/qpixmap/images/dx_0_dy_-10_x_y_w_h.png similarity index 100% rename from tests/auto/qpixmap/images/dx_0_dy_-10_x_y_w_h.png rename to tests/auto/gui/image/qpixmap/images/dx_0_dy_-10_x_y_w_h.png diff --git a/tests/auto/qpixmap/images/dx_0_dy_-128_x_y_w_h.png b/tests/auto/gui/image/qpixmap/images/dx_0_dy_-128_x_y_w_h.png similarity index 100% rename from tests/auto/qpixmap/images/dx_0_dy_-128_x_y_w_h.png rename to tests/auto/gui/image/qpixmap/images/dx_0_dy_-128_x_y_w_h.png diff --git a/tests/auto/qpixmap/images/dx_0_dy_0_50_50_100_100.png b/tests/auto/gui/image/qpixmap/images/dx_0_dy_0_50_50_100_100.png similarity index 100% rename from tests/auto/qpixmap/images/dx_0_dy_0_50_50_100_100.png rename to tests/auto/gui/image/qpixmap/images/dx_0_dy_0_50_50_100_100.png diff --git a/tests/auto/qpixmap/images/dx_0_dy_0_null.png b/tests/auto/gui/image/qpixmap/images/dx_0_dy_0_null.png similarity index 100% rename from tests/auto/qpixmap/images/dx_0_dy_0_null.png rename to tests/auto/gui/image/qpixmap/images/dx_0_dy_0_null.png diff --git a/tests/auto/qpixmap/images/dx_0_dy_0_x_y_w_h.png b/tests/auto/gui/image/qpixmap/images/dx_0_dy_0_x_y_w_h.png similarity index 100% rename from tests/auto/qpixmap/images/dx_0_dy_0_x_y_w_h.png rename to tests/auto/gui/image/qpixmap/images/dx_0_dy_0_x_y_w_h.png diff --git a/tests/auto/qpixmap/images/dx_0_dy_10_50_50_100_100.png b/tests/auto/gui/image/qpixmap/images/dx_0_dy_10_50_50_100_100.png similarity index 100% rename from tests/auto/qpixmap/images/dx_0_dy_10_50_50_100_100.png rename to tests/auto/gui/image/qpixmap/images/dx_0_dy_10_50_50_100_100.png diff --git a/tests/auto/qpixmap/images/dx_0_dy_10_x_y_w_h.png b/tests/auto/gui/image/qpixmap/images/dx_0_dy_10_x_y_w_h.png similarity index 100% rename from tests/auto/qpixmap/images/dx_0_dy_10_x_y_w_h.png rename to tests/auto/gui/image/qpixmap/images/dx_0_dy_10_x_y_w_h.png diff --git a/tests/auto/qpixmap/images/dx_0_dy_128_x_y_w_h.png b/tests/auto/gui/image/qpixmap/images/dx_0_dy_128_x_y_w_h.png similarity index 100% rename from tests/auto/qpixmap/images/dx_0_dy_128_x_y_w_h.png rename to tests/auto/gui/image/qpixmap/images/dx_0_dy_128_x_y_w_h.png diff --git a/tests/auto/qpixmap/images/dx_0_dy_1_null.png b/tests/auto/gui/image/qpixmap/images/dx_0_dy_1_null.png similarity index 100% rename from tests/auto/qpixmap/images/dx_0_dy_1_null.png rename to tests/auto/gui/image/qpixmap/images/dx_0_dy_1_null.png diff --git a/tests/auto/qpixmap/images/dx_10_dy_0_50_50_100_100.png b/tests/auto/gui/image/qpixmap/images/dx_10_dy_0_50_50_100_100.png similarity index 100% rename from tests/auto/qpixmap/images/dx_10_dy_0_50_50_100_100.png rename to tests/auto/gui/image/qpixmap/images/dx_10_dy_0_50_50_100_100.png diff --git a/tests/auto/qpixmap/images/dx_10_dy_0_x_y_w_h.png b/tests/auto/gui/image/qpixmap/images/dx_10_dy_0_x_y_w_h.png similarity index 100% rename from tests/auto/qpixmap/images/dx_10_dy_0_x_y_w_h.png rename to tests/auto/gui/image/qpixmap/images/dx_10_dy_0_x_y_w_h.png diff --git a/tests/auto/qpixmap/images/dx_10_dy_10_50_50_100_100.png b/tests/auto/gui/image/qpixmap/images/dx_10_dy_10_50_50_100_100.png similarity index 100% rename from tests/auto/qpixmap/images/dx_10_dy_10_50_50_100_100.png rename to tests/auto/gui/image/qpixmap/images/dx_10_dy_10_50_50_100_100.png diff --git a/tests/auto/qpixmap/images/dx_10_dy_10_x_y_w_h.png b/tests/auto/gui/image/qpixmap/images/dx_10_dy_10_x_y_w_h.png similarity index 100% rename from tests/auto/qpixmap/images/dx_10_dy_10_x_y_w_h.png rename to tests/auto/gui/image/qpixmap/images/dx_10_dy_10_x_y_w_h.png diff --git a/tests/auto/qpixmap/images/dx_128_dy_0_x_y_w_h.png b/tests/auto/gui/image/qpixmap/images/dx_128_dy_0_x_y_w_h.png similarity index 100% rename from tests/auto/qpixmap/images/dx_128_dy_0_x_y_w_h.png rename to tests/auto/gui/image/qpixmap/images/dx_128_dy_0_x_y_w_h.png diff --git a/tests/auto/qpixmap/images/dx_128_dy_128_64_64_128_128.png b/tests/auto/gui/image/qpixmap/images/dx_128_dy_128_64_64_128_128.png similarity index 100% rename from tests/auto/qpixmap/images/dx_128_dy_128_64_64_128_128.png rename to tests/auto/gui/image/qpixmap/images/dx_128_dy_128_64_64_128_128.png diff --git a/tests/auto/qpixmap/images/dx_128_dy_128_x_y_w_h.png b/tests/auto/gui/image/qpixmap/images/dx_128_dy_128_x_y_w_h.png similarity index 100% rename from tests/auto/qpixmap/images/dx_128_dy_128_x_y_w_h.png rename to tests/auto/gui/image/qpixmap/images/dx_128_dy_128_x_y_w_h.png diff --git a/tests/auto/qpixmap/images/dx_1_dy_0_null.png b/tests/auto/gui/image/qpixmap/images/dx_1_dy_0_null.png similarity index 100% rename from tests/auto/qpixmap/images/dx_1_dy_0_null.png rename to tests/auto/gui/image/qpixmap/images/dx_1_dy_0_null.png diff --git a/tests/auto/qpixmap/loadFromData/designer_argb32.png b/tests/auto/gui/image/qpixmap/loadFromData/designer_argb32.png similarity index 100% rename from tests/auto/qpixmap/loadFromData/designer_argb32.png rename to tests/auto/gui/image/qpixmap/loadFromData/designer_argb32.png diff --git a/tests/auto/qpixmap/loadFromData/designer_indexed8_no_alpha.gif b/tests/auto/gui/image/qpixmap/loadFromData/designer_indexed8_no_alpha.gif similarity index 100% rename from tests/auto/qpixmap/loadFromData/designer_indexed8_no_alpha.gif rename to tests/auto/gui/image/qpixmap/loadFromData/designer_indexed8_no_alpha.gif diff --git a/tests/auto/qpixmap/loadFromData/designer_indexed8_no_alpha.png b/tests/auto/gui/image/qpixmap/loadFromData/designer_indexed8_no_alpha.png similarity index 100% rename from tests/auto/qpixmap/loadFromData/designer_indexed8_no_alpha.png rename to tests/auto/gui/image/qpixmap/loadFromData/designer_indexed8_no_alpha.png diff --git a/tests/auto/qpixmap/loadFromData/designer_indexed8_no_alpha_animated.gif b/tests/auto/gui/image/qpixmap/loadFromData/designer_indexed8_no_alpha_animated.gif similarity index 100% rename from tests/auto/qpixmap/loadFromData/designer_indexed8_no_alpha_animated.gif rename to tests/auto/gui/image/qpixmap/loadFromData/designer_indexed8_no_alpha_animated.gif diff --git a/tests/auto/qpixmap/loadFromData/designer_indexed8_with_alpha.gif b/tests/auto/gui/image/qpixmap/loadFromData/designer_indexed8_with_alpha.gif similarity index 100% rename from tests/auto/qpixmap/loadFromData/designer_indexed8_with_alpha.gif rename to tests/auto/gui/image/qpixmap/loadFromData/designer_indexed8_with_alpha.gif diff --git a/tests/auto/qpixmap/loadFromData/designer_indexed8_with_alpha.png b/tests/auto/gui/image/qpixmap/loadFromData/designer_indexed8_with_alpha.png similarity index 100% rename from tests/auto/qpixmap/loadFromData/designer_indexed8_with_alpha.png rename to tests/auto/gui/image/qpixmap/loadFromData/designer_indexed8_with_alpha.png diff --git a/tests/auto/qpixmap/loadFromData/designer_indexed8_with_alpha_animated.gif b/tests/auto/gui/image/qpixmap/loadFromData/designer_indexed8_with_alpha_animated.gif similarity index 100% rename from tests/auto/qpixmap/loadFromData/designer_indexed8_with_alpha_animated.gif rename to tests/auto/gui/image/qpixmap/loadFromData/designer_indexed8_with_alpha_animated.gif diff --git a/tests/auto/qpixmap/loadFromData/designer_rgb32.jpg b/tests/auto/gui/image/qpixmap/loadFromData/designer_rgb32.jpg similarity index 100% rename from tests/auto/qpixmap/loadFromData/designer_rgb32.jpg rename to tests/auto/gui/image/qpixmap/loadFromData/designer_rgb32.jpg diff --git a/tests/auto/qpixmap/loadFromData/designer_rgb32.png b/tests/auto/gui/image/qpixmap/loadFromData/designer_rgb32.png similarity index 100% rename from tests/auto/qpixmap/loadFromData/designer_rgb32.png rename to tests/auto/gui/image/qpixmap/loadFromData/designer_rgb32.png diff --git a/tests/auto/qpixmap/qpixmap.pro b/tests/auto/gui/image/qpixmap/qpixmap.pro similarity index 100% rename from tests/auto/qpixmap/qpixmap.pro rename to tests/auto/gui/image/qpixmap/qpixmap.pro diff --git a/tests/auto/qpixmap/qpixmap.qrc b/tests/auto/gui/image/qpixmap/qpixmap.qrc similarity index 100% rename from tests/auto/qpixmap/qpixmap.qrc rename to tests/auto/gui/image/qpixmap/qpixmap.qrc diff --git a/tests/auto/qpixmap/tst_qpixmap.cpp b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp similarity index 100% rename from tests/auto/qpixmap/tst_qpixmap.cpp rename to tests/auto/gui/image/qpixmap/tst_qpixmap.cpp diff --git a/tests/auto/qpixmapcache/.gitignore b/tests/auto/gui/image/qpixmapcache/.gitignore similarity index 100% rename from tests/auto/qpixmapcache/.gitignore rename to tests/auto/gui/image/qpixmapcache/.gitignore diff --git a/tests/auto/qpixmapcache/qpixmapcache.pro b/tests/auto/gui/image/qpixmapcache/qpixmapcache.pro similarity index 100% rename from tests/auto/qpixmapcache/qpixmapcache.pro rename to tests/auto/gui/image/qpixmapcache/qpixmapcache.pro diff --git a/tests/auto/qpixmapcache/tst_qpixmapcache.cpp b/tests/auto/gui/image/qpixmapcache/tst_qpixmapcache.cpp similarity index 100% rename from tests/auto/qpixmapcache/tst_qpixmapcache.cpp rename to tests/auto/gui/image/qpixmapcache/tst_qpixmapcache.cpp diff --git a/tests/auto/qpixmapfilter/noise.png b/tests/auto/gui/image/qpixmapfilter/noise.png similarity index 100% rename from tests/auto/qpixmapfilter/noise.png rename to tests/auto/gui/image/qpixmapfilter/noise.png diff --git a/tests/auto/qpixmapfilter/qpixmapfilter.pro b/tests/auto/gui/image/qpixmapfilter/qpixmapfilter.pro similarity index 100% rename from tests/auto/qpixmapfilter/qpixmapfilter.pro rename to tests/auto/gui/image/qpixmapfilter/qpixmapfilter.pro diff --git a/tests/auto/qpixmapfilter/tst_qpixmapfilter.cpp b/tests/auto/gui/image/qpixmapfilter/tst_qpixmapfilter.cpp similarity index 100% rename from tests/auto/qpixmapfilter/tst_qpixmapfilter.cpp rename to tests/auto/gui/image/qpixmapfilter/tst_qpixmapfilter.cpp diff --git a/tests/auto/qvolatileimage/qvolatileimage.pro b/tests/auto/gui/image/qvolatileimage/qvolatileimage.pro similarity index 100% rename from tests/auto/qvolatileimage/qvolatileimage.pro rename to tests/auto/gui/image/qvolatileimage/qvolatileimage.pro diff --git a/tests/auto/qvolatileimage/tst_qvolatileimage.cpp b/tests/auto/gui/image/qvolatileimage/tst_qvolatileimage.cpp similarity index 100% rename from tests/auto/qvolatileimage/tst_qvolatileimage.cpp rename to tests/auto/gui/image/qvolatileimage/tst_qvolatileimage.cpp diff --git a/tests/auto/gui/kernel/kernel.pro b/tests/auto/gui/kernel/kernel.pro new file mode 100644 index 00000000000..880c3c86138 --- /dev/null +++ b/tests/auto/gui/kernel/kernel.pro @@ -0,0 +1,17 @@ +TEMPLATE=subdirs +SUBDIRS=\ + qclipboard \ + qdrag \ + qevent \ + qfileopenevent \ + qguivariant \ + qkeysequence \ + qmouseevent \ + qmouseevent_modal \ + qpalette \ + qshortcut \ + qtouchevent \ + +symbian { + SUBDIRS += qsoftkeymanager +} diff --git a/tests/auto/qclipboard/.gitignore b/tests/auto/gui/kernel/qclipboard/.gitignore similarity index 100% rename from tests/auto/qclipboard/.gitignore rename to tests/auto/gui/kernel/qclipboard/.gitignore diff --git a/tests/auto/qclipboard/copier/copier.pro b/tests/auto/gui/kernel/qclipboard/copier/copier.pro similarity index 100% rename from tests/auto/qclipboard/copier/copier.pro rename to tests/auto/gui/kernel/qclipboard/copier/copier.pro diff --git a/tests/auto/qclipboard/copier/main.cpp b/tests/auto/gui/kernel/qclipboard/copier/main.cpp similarity index 100% rename from tests/auto/qclipboard/copier/main.cpp rename to tests/auto/gui/kernel/qclipboard/copier/main.cpp diff --git a/tests/auto/qclipboard/paster/main.cpp b/tests/auto/gui/kernel/qclipboard/paster/main.cpp similarity index 100% rename from tests/auto/qclipboard/paster/main.cpp rename to tests/auto/gui/kernel/qclipboard/paster/main.cpp diff --git a/tests/auto/qclipboard/paster/paster.pro b/tests/auto/gui/kernel/qclipboard/paster/paster.pro similarity index 100% rename from tests/auto/qclipboard/paster/paster.pro rename to tests/auto/gui/kernel/qclipboard/paster/paster.pro diff --git a/tests/auto/qclipboard/qclipboard.pro b/tests/auto/gui/kernel/qclipboard/qclipboard.pro similarity index 100% rename from tests/auto/qclipboard/qclipboard.pro rename to tests/auto/gui/kernel/qclipboard/qclipboard.pro diff --git a/tests/auto/qclipboard/test/test.pro b/tests/auto/gui/kernel/qclipboard/test/test.pro similarity index 100% rename from tests/auto/qclipboard/test/test.pro rename to tests/auto/gui/kernel/qclipboard/test/test.pro diff --git a/tests/auto/qclipboard/tst_qclipboard.cpp b/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp similarity index 100% rename from tests/auto/qclipboard/tst_qclipboard.cpp rename to tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp diff --git a/tests/auto/qdrag/.gitignore b/tests/auto/gui/kernel/qdrag/.gitignore similarity index 100% rename from tests/auto/qdrag/.gitignore rename to tests/auto/gui/kernel/qdrag/.gitignore diff --git a/tests/auto/qdrag/qdrag.pro b/tests/auto/gui/kernel/qdrag/qdrag.pro similarity index 100% rename from tests/auto/qdrag/qdrag.pro rename to tests/auto/gui/kernel/qdrag/qdrag.pro diff --git a/tests/auto/qdrag/tst_qdrag.cpp b/tests/auto/gui/kernel/qdrag/tst_qdrag.cpp similarity index 100% rename from tests/auto/qdrag/tst_qdrag.cpp rename to tests/auto/gui/kernel/qdrag/tst_qdrag.cpp diff --git a/tests/auto/qevent/.gitignore b/tests/auto/gui/kernel/qevent/.gitignore similarity index 100% rename from tests/auto/qevent/.gitignore rename to tests/auto/gui/kernel/qevent/.gitignore diff --git a/tests/auto/qevent/qevent.pro b/tests/auto/gui/kernel/qevent/qevent.pro similarity index 100% rename from tests/auto/qevent/qevent.pro rename to tests/auto/gui/kernel/qevent/qevent.pro diff --git a/tests/auto/qevent/tst_qevent.cpp b/tests/auto/gui/kernel/qevent/tst_qevent.cpp similarity index 100% rename from tests/auto/qevent/tst_qevent.cpp rename to tests/auto/gui/kernel/qevent/tst_qevent.cpp diff --git a/tests/auto/qfileopenevent/qfileopenevent.pro b/tests/auto/gui/kernel/qfileopenevent/qfileopenevent.pro similarity index 100% rename from tests/auto/qfileopenevent/qfileopenevent.pro rename to tests/auto/gui/kernel/qfileopenevent/qfileopenevent.pro diff --git a/tests/auto/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.cpp b/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.cpp similarity index 100% rename from tests/auto/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.cpp rename to tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.cpp diff --git a/tests/auto/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.pro b/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.pro similarity index 100% rename from tests/auto/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.pro rename to tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.pro diff --git a/tests/auto/qfileopenevent/test/test.pro b/tests/auto/gui/kernel/qfileopenevent/test/test.pro similarity index 100% rename from tests/auto/qfileopenevent/test/test.pro rename to tests/auto/gui/kernel/qfileopenevent/test/test.pro diff --git a/tests/auto/qfileopenevent/test/tst_qfileopenevent.cpp b/tests/auto/gui/kernel/qfileopenevent/test/tst_qfileopenevent.cpp similarity index 100% rename from tests/auto/qfileopenevent/test/tst_qfileopenevent.cpp rename to tests/auto/gui/kernel/qfileopenevent/test/tst_qfileopenevent.cpp diff --git a/tests/auto/qguivariant/.gitignore b/tests/auto/gui/kernel/qguivariant/.gitignore similarity index 100% rename from tests/auto/qguivariant/.gitignore rename to tests/auto/gui/kernel/qguivariant/.gitignore diff --git a/tests/auto/qguivariant/qguivariant.pro b/tests/auto/gui/kernel/qguivariant/qguivariant.pro similarity index 100% rename from tests/auto/qguivariant/qguivariant.pro rename to tests/auto/gui/kernel/qguivariant/qguivariant.pro diff --git a/tests/auto/qguivariant/tst_qguivariant.cpp b/tests/auto/gui/kernel/qguivariant/tst_qguivariant.cpp similarity index 100% rename from tests/auto/qguivariant/tst_qguivariant.cpp rename to tests/auto/gui/kernel/qguivariant/tst_qguivariant.cpp diff --git a/tests/auto/qkeysequence/.gitignore b/tests/auto/gui/kernel/qkeysequence/.gitignore similarity index 100% rename from tests/auto/qkeysequence/.gitignore rename to tests/auto/gui/kernel/qkeysequence/.gitignore diff --git a/tests/auto/qkeysequence/keys_de.qm b/tests/auto/gui/kernel/qkeysequence/keys_de.qm similarity index 100% rename from tests/auto/qkeysequence/keys_de.qm rename to tests/auto/gui/kernel/qkeysequence/keys_de.qm diff --git a/tests/auto/qkeysequence/keys_de.ts b/tests/auto/gui/kernel/qkeysequence/keys_de.ts similarity index 100% rename from tests/auto/qkeysequence/keys_de.ts rename to tests/auto/gui/kernel/qkeysequence/keys_de.ts diff --git a/tests/auto/qkeysequence/qkeysequence.pro b/tests/auto/gui/kernel/qkeysequence/qkeysequence.pro similarity index 100% rename from tests/auto/qkeysequence/qkeysequence.pro rename to tests/auto/gui/kernel/qkeysequence/qkeysequence.pro diff --git a/tests/auto/qkeysequence/qkeysequence.qrc b/tests/auto/gui/kernel/qkeysequence/qkeysequence.qrc similarity index 100% rename from tests/auto/qkeysequence/qkeysequence.qrc rename to tests/auto/gui/kernel/qkeysequence/qkeysequence.qrc diff --git a/tests/auto/qkeysequence/qt_de.qm b/tests/auto/gui/kernel/qkeysequence/qt_de.qm similarity index 100% rename from tests/auto/qkeysequence/qt_de.qm rename to tests/auto/gui/kernel/qkeysequence/qt_de.qm diff --git a/tests/auto/qkeysequence/tst_qkeysequence.cpp b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp similarity index 100% rename from tests/auto/qkeysequence/tst_qkeysequence.cpp rename to tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp diff --git a/tests/auto/qmouseevent/.gitignore b/tests/auto/gui/kernel/qmouseevent/.gitignore similarity index 100% rename from tests/auto/qmouseevent/.gitignore rename to tests/auto/gui/kernel/qmouseevent/.gitignore diff --git a/tests/auto/qmouseevent/qmouseevent.pro b/tests/auto/gui/kernel/qmouseevent/qmouseevent.pro similarity index 100% rename from tests/auto/qmouseevent/qmouseevent.pro rename to tests/auto/gui/kernel/qmouseevent/qmouseevent.pro diff --git a/tests/auto/qmouseevent/tst_qmouseevent.cpp b/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp similarity index 100% rename from tests/auto/qmouseevent/tst_qmouseevent.cpp rename to tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp diff --git a/tests/auto/qmouseevent_modal/.gitignore b/tests/auto/gui/kernel/qmouseevent_modal/.gitignore similarity index 100% rename from tests/auto/qmouseevent_modal/.gitignore rename to tests/auto/gui/kernel/qmouseevent_modal/.gitignore diff --git a/tests/auto/qmouseevent_modal/qmouseevent_modal.pro b/tests/auto/gui/kernel/qmouseevent_modal/qmouseevent_modal.pro similarity index 100% rename from tests/auto/qmouseevent_modal/qmouseevent_modal.pro rename to tests/auto/gui/kernel/qmouseevent_modal/qmouseevent_modal.pro diff --git a/tests/auto/qmouseevent_modal/tst_qmouseevent_modal.cpp b/tests/auto/gui/kernel/qmouseevent_modal/tst_qmouseevent_modal.cpp similarity index 100% rename from tests/auto/qmouseevent_modal/tst_qmouseevent_modal.cpp rename to tests/auto/gui/kernel/qmouseevent_modal/tst_qmouseevent_modal.cpp diff --git a/tests/auto/qpalette/.gitignore b/tests/auto/gui/kernel/qpalette/.gitignore similarity index 100% rename from tests/auto/qpalette/.gitignore rename to tests/auto/gui/kernel/qpalette/.gitignore diff --git a/tests/auto/qpalette/qpalette.pro b/tests/auto/gui/kernel/qpalette/qpalette.pro similarity index 100% rename from tests/auto/qpalette/qpalette.pro rename to tests/auto/gui/kernel/qpalette/qpalette.pro diff --git a/tests/auto/qpalette/tst_qpalette.cpp b/tests/auto/gui/kernel/qpalette/tst_qpalette.cpp similarity index 100% rename from tests/auto/qpalette/tst_qpalette.cpp rename to tests/auto/gui/kernel/qpalette/tst_qpalette.cpp diff --git a/tests/auto/qshortcut/.gitignore b/tests/auto/gui/kernel/qshortcut/.gitignore similarity index 100% rename from tests/auto/qshortcut/.gitignore rename to tests/auto/gui/kernel/qshortcut/.gitignore diff --git a/tests/auto/qshortcut/qshortcut.pro b/tests/auto/gui/kernel/qshortcut/qshortcut.pro similarity index 100% rename from tests/auto/qshortcut/qshortcut.pro rename to tests/auto/gui/kernel/qshortcut/qshortcut.pro diff --git a/tests/auto/qshortcut/tst_qshortcut.cpp b/tests/auto/gui/kernel/qshortcut/tst_qshortcut.cpp similarity index 100% rename from tests/auto/qshortcut/tst_qshortcut.cpp rename to tests/auto/gui/kernel/qshortcut/tst_qshortcut.cpp diff --git a/tests/auto/qtouchevent/qtouchevent.pro b/tests/auto/gui/kernel/qtouchevent/qtouchevent.pro similarity index 100% rename from tests/auto/qtouchevent/qtouchevent.pro rename to tests/auto/gui/kernel/qtouchevent/qtouchevent.pro diff --git a/tests/auto/qtouchevent/tst_qtouchevent.cpp b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp similarity index 100% rename from tests/auto/qtouchevent/tst_qtouchevent.cpp rename to tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp diff --git a/tests/auto/gui/math3d/math3d.pro b/tests/auto/gui/math3d/math3d.pro new file mode 100644 index 00000000000..d977afa6e06 --- /dev/null +++ b/tests/auto/gui/math3d/math3d.pro @@ -0,0 +1,6 @@ +TEMPLATE=subdirs +SUBDIRS=\ + qquaternion \ + qvectornd \ + qmatrixnxn \ + diff --git a/tests/auto/qmatrixnxn/qmatrixnxn.pro b/tests/auto/gui/math3d/qmatrixnxn/qmatrixnxn.pro similarity index 100% rename from tests/auto/qmatrixnxn/qmatrixnxn.pro rename to tests/auto/gui/math3d/qmatrixnxn/qmatrixnxn.pro diff --git a/tests/auto/qmatrixnxn/tst_qmatrixnxn.cpp b/tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp similarity index 100% rename from tests/auto/qmatrixnxn/tst_qmatrixnxn.cpp rename to tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp diff --git a/tests/auto/qquaternion/qquaternion.pro b/tests/auto/gui/math3d/qquaternion/qquaternion.pro similarity index 100% rename from tests/auto/qquaternion/qquaternion.pro rename to tests/auto/gui/math3d/qquaternion/qquaternion.pro diff --git a/tests/auto/qquaternion/tst_qquaternion.cpp b/tests/auto/gui/math3d/qquaternion/tst_qquaternion.cpp similarity index 100% rename from tests/auto/qquaternion/tst_qquaternion.cpp rename to tests/auto/gui/math3d/qquaternion/tst_qquaternion.cpp diff --git a/tests/auto/qvectornd/qvectornd.pro b/tests/auto/gui/math3d/qvectornd/qvectornd.pro similarity index 100% rename from tests/auto/qvectornd/qvectornd.pro rename to tests/auto/gui/math3d/qvectornd/qvectornd.pro diff --git a/tests/auto/qvectornd/tst_qvectornd.cpp b/tests/auto/gui/math3d/qvectornd/tst_qvectornd.cpp similarity index 100% rename from tests/auto/qvectornd/tst_qvectornd.cpp rename to tests/auto/gui/math3d/qvectornd/tst_qvectornd.cpp diff --git a/tests/auto/gui/painting/painting.pro b/tests/auto/gui/painting/painting.pro new file mode 100644 index 00000000000..62230eeac7d --- /dev/null +++ b/tests/auto/gui/painting/painting.pro @@ -0,0 +1,21 @@ +TEMPLATE=subdirs +SUBDIRS=\ + qpainterpath \ + qpainterpathstroker \ + qcolor \ + qbrush \ + qregion \ + qpainter \ + qpathclipper \ + qprinterinfo \ + qpen \ + qpaintengine \ + qtransform \ + qwmatrix \ + qprinter \ + qpolygon \ + +!contains(QT_CONFIG, private_tests): SUBDIRS -= \ + qpathclipper \ + + diff --git a/tests/auto/qbrush/.gitignore b/tests/auto/gui/painting/qbrush/.gitignore similarity index 100% rename from tests/auto/qbrush/.gitignore rename to tests/auto/gui/painting/qbrush/.gitignore diff --git a/tests/auto/qbrush/qbrush.pro b/tests/auto/gui/painting/qbrush/qbrush.pro similarity index 100% rename from tests/auto/qbrush/qbrush.pro rename to tests/auto/gui/painting/qbrush/qbrush.pro diff --git a/tests/auto/qbrush/tst_qbrush.cpp b/tests/auto/gui/painting/qbrush/tst_qbrush.cpp similarity index 100% rename from tests/auto/qbrush/tst_qbrush.cpp rename to tests/auto/gui/painting/qbrush/tst_qbrush.cpp diff --git a/tests/auto/qcolor/.gitignore b/tests/auto/gui/painting/qcolor/.gitignore similarity index 100% rename from tests/auto/qcolor/.gitignore rename to tests/auto/gui/painting/qcolor/.gitignore diff --git a/tests/auto/qcolor/qcolor.pro b/tests/auto/gui/painting/qcolor/qcolor.pro similarity index 100% rename from tests/auto/qcolor/qcolor.pro rename to tests/auto/gui/painting/qcolor/qcolor.pro diff --git a/tests/auto/qcolor/tst_qcolor.cpp b/tests/auto/gui/painting/qcolor/tst_qcolor.cpp similarity index 100% rename from tests/auto/qcolor/tst_qcolor.cpp rename to tests/auto/gui/painting/qcolor/tst_qcolor.cpp diff --git a/tests/auto/qpaintengine/.gitignore b/tests/auto/gui/painting/qpaintengine/.gitignore similarity index 100% rename from tests/auto/qpaintengine/.gitignore rename to tests/auto/gui/painting/qpaintengine/.gitignore diff --git a/tests/auto/qpaintengine/qpaintengine.pro b/tests/auto/gui/painting/qpaintengine/qpaintengine.pro similarity index 100% rename from tests/auto/qpaintengine/qpaintengine.pro rename to tests/auto/gui/painting/qpaintengine/qpaintengine.pro diff --git a/tests/auto/qpaintengine/tst_qpaintengine.cpp b/tests/auto/gui/painting/qpaintengine/tst_qpaintengine.cpp similarity index 100% rename from tests/auto/qpaintengine/tst_qpaintengine.cpp rename to tests/auto/gui/painting/qpaintengine/tst_qpaintengine.cpp diff --git a/tests/auto/qpainter/.gitignore b/tests/auto/gui/painting/qpainter/.gitignore similarity index 100% rename from tests/auto/qpainter/.gitignore rename to tests/auto/gui/painting/qpainter/.gitignore diff --git a/tests/auto/qpainter/drawEllipse/10x10SizeAt0x0.png b/tests/auto/gui/painting/qpainter/drawEllipse/10x10SizeAt0x0.png similarity index 100% rename from tests/auto/qpainter/drawEllipse/10x10SizeAt0x0.png rename to tests/auto/gui/painting/qpainter/drawEllipse/10x10SizeAt0x0.png diff --git a/tests/auto/qpainter/drawEllipse/10x10SizeAt100x100.png b/tests/auto/gui/painting/qpainter/drawEllipse/10x10SizeAt100x100.png similarity index 100% rename from tests/auto/qpainter/drawEllipse/10x10SizeAt100x100.png rename to tests/auto/gui/painting/qpainter/drawEllipse/10x10SizeAt100x100.png diff --git a/tests/auto/qpainter/drawEllipse/10x10SizeAt200x200.png b/tests/auto/gui/painting/qpainter/drawEllipse/10x10SizeAt200x200.png similarity index 100% rename from tests/auto/qpainter/drawEllipse/10x10SizeAt200x200.png rename to tests/auto/gui/painting/qpainter/drawEllipse/10x10SizeAt200x200.png diff --git a/tests/auto/qpainter/drawEllipse/13x100SizeAt0x0.png b/tests/auto/gui/painting/qpainter/drawEllipse/13x100SizeAt0x0.png similarity index 100% rename from tests/auto/qpainter/drawEllipse/13x100SizeAt0x0.png rename to tests/auto/gui/painting/qpainter/drawEllipse/13x100SizeAt0x0.png diff --git a/tests/auto/qpainter/drawEllipse/13x100SizeAt100x100.png b/tests/auto/gui/painting/qpainter/drawEllipse/13x100SizeAt100x100.png similarity index 100% rename from tests/auto/qpainter/drawEllipse/13x100SizeAt100x100.png rename to tests/auto/gui/painting/qpainter/drawEllipse/13x100SizeAt100x100.png diff --git a/tests/auto/qpainter/drawEllipse/13x100SizeAt200x200.png b/tests/auto/gui/painting/qpainter/drawEllipse/13x100SizeAt200x200.png similarity index 100% rename from tests/auto/qpainter/drawEllipse/13x100SizeAt200x200.png rename to tests/auto/gui/painting/qpainter/drawEllipse/13x100SizeAt200x200.png diff --git a/tests/auto/qpainter/drawEllipse/200x200SizeAt0x0.png b/tests/auto/gui/painting/qpainter/drawEllipse/200x200SizeAt0x0.png similarity index 100% rename from tests/auto/qpainter/drawEllipse/200x200SizeAt0x0.png rename to tests/auto/gui/painting/qpainter/drawEllipse/200x200SizeAt0x0.png diff --git a/tests/auto/qpainter/drawEllipse/200x200SizeAt100x100.png b/tests/auto/gui/painting/qpainter/drawEllipse/200x200SizeAt100x100.png similarity index 100% rename from tests/auto/qpainter/drawEllipse/200x200SizeAt100x100.png rename to tests/auto/gui/painting/qpainter/drawEllipse/200x200SizeAt100x100.png diff --git a/tests/auto/qpainter/drawEllipse/200x200SizeAt200x200.png b/tests/auto/gui/painting/qpainter/drawEllipse/200x200SizeAt200x200.png similarity index 100% rename from tests/auto/qpainter/drawEllipse/200x200SizeAt200x200.png rename to tests/auto/gui/painting/qpainter/drawEllipse/200x200SizeAt200x200.png diff --git a/tests/auto/qpainter/drawLine_rop_bitmap/dst.xbm b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/dst.xbm similarity index 100% rename from tests/auto/qpainter/drawLine_rop_bitmap/dst.xbm rename to tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/dst.xbm diff --git a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_AndNotROP.xbm b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_AndNotROP.xbm similarity index 100% rename from tests/auto/qpainter/drawLine_rop_bitmap/res/res_AndNotROP.xbm rename to tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_AndNotROP.xbm diff --git a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_AndROP.xbm b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_AndROP.xbm similarity index 100% rename from tests/auto/qpainter/drawLine_rop_bitmap/res/res_AndROP.xbm rename to tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_AndROP.xbm diff --git a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_ClearROP.xbm b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_ClearROP.xbm similarity index 100% rename from tests/auto/qpainter/drawLine_rop_bitmap/res/res_ClearROP.xbm rename to tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_ClearROP.xbm diff --git a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_CopyROP.xbm b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_CopyROP.xbm similarity index 100% rename from tests/auto/qpainter/drawLine_rop_bitmap/res/res_CopyROP.xbm rename to tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_CopyROP.xbm diff --git a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_NandROP.xbm b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_NandROP.xbm similarity index 100% rename from tests/auto/qpainter/drawLine_rop_bitmap/res/res_NandROP.xbm rename to tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_NandROP.xbm diff --git a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_NopROP.xbm b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_NopROP.xbm similarity index 100% rename from tests/auto/qpainter/drawLine_rop_bitmap/res/res_NopROP.xbm rename to tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_NopROP.xbm diff --git a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_NorROP.xbm b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_NorROP.xbm similarity index 100% rename from tests/auto/qpainter/drawLine_rop_bitmap/res/res_NorROP.xbm rename to tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_NorROP.xbm diff --git a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_NotAndROP.xbm b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_NotAndROP.xbm similarity index 100% rename from tests/auto/qpainter/drawLine_rop_bitmap/res/res_NotAndROP.xbm rename to tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_NotAndROP.xbm diff --git a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_NotCopyROP.xbm b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_NotCopyROP.xbm similarity index 100% rename from tests/auto/qpainter/drawLine_rop_bitmap/res/res_NotCopyROP.xbm rename to tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_NotCopyROP.xbm diff --git a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_NotOrROP.xbm b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_NotOrROP.xbm similarity index 100% rename from tests/auto/qpainter/drawLine_rop_bitmap/res/res_NotOrROP.xbm rename to tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_NotOrROP.xbm diff --git a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_NotROP.xbm b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_NotROP.xbm similarity index 100% rename from tests/auto/qpainter/drawLine_rop_bitmap/res/res_NotROP.xbm rename to tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_NotROP.xbm diff --git a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_NotXorROP.xbm b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_NotXorROP.xbm similarity index 100% rename from tests/auto/qpainter/drawLine_rop_bitmap/res/res_NotXorROP.xbm rename to tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_NotXorROP.xbm diff --git a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_OrNotROP.xbm b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_OrNotROP.xbm similarity index 100% rename from tests/auto/qpainter/drawLine_rop_bitmap/res/res_OrNotROP.xbm rename to tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_OrNotROP.xbm diff --git a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_OrROP.xbm b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_OrROP.xbm similarity index 100% rename from tests/auto/qpainter/drawLine_rop_bitmap/res/res_OrROP.xbm rename to tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_OrROP.xbm diff --git a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_SetROP.xbm b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_SetROP.xbm similarity index 100% rename from tests/auto/qpainter/drawLine_rop_bitmap/res/res_SetROP.xbm rename to tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_SetROP.xbm diff --git a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_XorROP.xbm b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_XorROP.xbm similarity index 100% rename from tests/auto/qpainter/drawLine_rop_bitmap/res/res_XorROP.xbm rename to tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_XorROP.xbm diff --git a/tests/auto/qpainter/drawPixmap_rop/dst1.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/dst1.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/dst1.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/dst1.png diff --git a/tests/auto/qpainter/drawPixmap_rop/dst2.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/dst2.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/dst2.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/dst2.png diff --git a/tests/auto/qpainter/drawPixmap_rop/dst3.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/dst3.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/dst3.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/dst3.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_AndNotROP0.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndNotROP0.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_AndNotROP0.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndNotROP0.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_AndNotROP1.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndNotROP1.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_AndNotROP1.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndNotROP1.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_AndNotROP2.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndNotROP2.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_AndNotROP2.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndNotROP2.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_AndNotROP3.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndNotROP3.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_AndNotROP3.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndNotROP3.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_AndNotROP4.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndNotROP4.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_AndNotROP4.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndNotROP4.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_AndNotROP5.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndNotROP5.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_AndNotROP5.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndNotROP5.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_AndNotROP6.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndNotROP6.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_AndNotROP6.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndNotROP6.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_AndNotROP7.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndNotROP7.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_AndNotROP7.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndNotROP7.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_AndROP0.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndROP0.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_AndROP0.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndROP0.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_AndROP1.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndROP1.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_AndROP1.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndROP1.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_AndROP2.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndROP2.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_AndROP2.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndROP2.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_AndROP3.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndROP3.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_AndROP3.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndROP3.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_AndROP4.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndROP4.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_AndROP4.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndROP4.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_AndROP5.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndROP5.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_AndROP5.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndROP5.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_AndROP6.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndROP6.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_AndROP6.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndROP6.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_AndROP7.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndROP7.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_AndROP7.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndROP7.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_ClearROP0.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_ClearROP0.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_ClearROP0.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_ClearROP0.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_ClearROP1.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_ClearROP1.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_ClearROP1.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_ClearROP1.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_ClearROP2.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_ClearROP2.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_ClearROP2.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_ClearROP2.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_ClearROP3.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_ClearROP3.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_ClearROP3.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_ClearROP3.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_ClearROP4.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_ClearROP4.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_ClearROP4.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_ClearROP4.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_ClearROP5.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_ClearROP5.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_ClearROP5.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_ClearROP5.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_ClearROP6.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_ClearROP6.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_ClearROP6.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_ClearROP6.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_ClearROP7.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_ClearROP7.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_ClearROP7.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_ClearROP7.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_CopyROP0.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_CopyROP0.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_CopyROP0.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_CopyROP0.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_CopyROP1.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_CopyROP1.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_CopyROP1.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_CopyROP1.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_CopyROP2.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_CopyROP2.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_CopyROP2.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_CopyROP2.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_CopyROP3.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_CopyROP3.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_CopyROP3.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_CopyROP3.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_CopyROP4.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_CopyROP4.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_CopyROP4.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_CopyROP4.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_CopyROP5.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_CopyROP5.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_CopyROP5.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_CopyROP5.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_CopyROP6.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_CopyROP6.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_CopyROP6.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_CopyROP6.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_CopyROP7.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_CopyROP7.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_CopyROP7.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_CopyROP7.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NandROP0.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NandROP0.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NandROP0.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NandROP0.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NandROP1.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NandROP1.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NandROP1.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NandROP1.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NandROP2.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NandROP2.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NandROP2.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NandROP2.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NandROP3.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NandROP3.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NandROP3.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NandROP3.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NandROP4.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NandROP4.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NandROP4.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NandROP4.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NandROP5.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NandROP5.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NandROP5.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NandROP5.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NandROP6.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NandROP6.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NandROP6.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NandROP6.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NandROP7.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NandROP7.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NandROP7.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NandROP7.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NopROP0.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NopROP0.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NopROP0.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NopROP0.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NopROP1.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NopROP1.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NopROP1.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NopROP1.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NopROP2.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NopROP2.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NopROP2.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NopROP2.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NopROP3.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NopROP3.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NopROP3.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NopROP3.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NopROP4.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NopROP4.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NopROP4.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NopROP4.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NopROP5.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NopROP5.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NopROP5.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NopROP5.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NopROP6.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NopROP6.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NopROP6.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NopROP6.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NopROP7.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NopROP7.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NopROP7.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NopROP7.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NorROP0.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NorROP0.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NorROP0.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NorROP0.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NorROP1.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NorROP1.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NorROP1.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NorROP1.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NorROP2.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NorROP2.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NorROP2.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NorROP2.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NorROP3.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NorROP3.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NorROP3.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NorROP3.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NorROP4.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NorROP4.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NorROP4.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NorROP4.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NorROP5.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NorROP5.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NorROP5.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NorROP5.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NorROP6.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NorROP6.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NorROP6.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NorROP6.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NorROP7.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NorROP7.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NorROP7.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NorROP7.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotAndROP0.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotAndROP0.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NotAndROP0.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotAndROP0.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotAndROP1.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotAndROP1.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NotAndROP1.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotAndROP1.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotAndROP2.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotAndROP2.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NotAndROP2.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotAndROP2.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotAndROP3.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotAndROP3.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NotAndROP3.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotAndROP3.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotAndROP4.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotAndROP4.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NotAndROP4.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotAndROP4.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotAndROP5.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotAndROP5.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NotAndROP5.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotAndROP5.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotAndROP6.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotAndROP6.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NotAndROP6.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotAndROP6.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotAndROP7.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotAndROP7.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NotAndROP7.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotAndROP7.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotCopyROP0.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotCopyROP0.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NotCopyROP0.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotCopyROP0.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotCopyROP1.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotCopyROP1.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NotCopyROP1.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotCopyROP1.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotCopyROP2.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotCopyROP2.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NotCopyROP2.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotCopyROP2.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotCopyROP3.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotCopyROP3.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NotCopyROP3.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotCopyROP3.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotCopyROP4.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotCopyROP4.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NotCopyROP4.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotCopyROP4.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotCopyROP5.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotCopyROP5.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NotCopyROP5.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotCopyROP5.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotCopyROP6.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotCopyROP6.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NotCopyROP6.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotCopyROP6.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotCopyROP7.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotCopyROP7.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NotCopyROP7.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotCopyROP7.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotOrROP0.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotOrROP0.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NotOrROP0.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotOrROP0.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotOrROP1.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotOrROP1.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NotOrROP1.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotOrROP1.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotOrROP2.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotOrROP2.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NotOrROP2.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotOrROP2.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotOrROP3.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotOrROP3.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NotOrROP3.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotOrROP3.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotOrROP4.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotOrROP4.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NotOrROP4.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotOrROP4.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotOrROP5.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotOrROP5.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NotOrROP5.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotOrROP5.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotOrROP6.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotOrROP6.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NotOrROP6.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotOrROP6.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotOrROP7.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotOrROP7.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NotOrROP7.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotOrROP7.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotROP0.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotROP0.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NotROP0.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotROP0.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotROP1.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotROP1.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NotROP1.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotROP1.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotROP2.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotROP2.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NotROP2.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotROP2.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotROP3.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotROP3.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NotROP3.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotROP3.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotROP4.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotROP4.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NotROP4.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotROP4.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotROP5.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotROP5.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NotROP5.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotROP5.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotROP6.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotROP6.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NotROP6.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotROP6.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotROP7.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotROP7.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NotROP7.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotROP7.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotXorROP0.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotXorROP0.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NotXorROP0.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotXorROP0.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotXorROP1.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotXorROP1.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NotXorROP1.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotXorROP1.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotXorROP2.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotXorROP2.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NotXorROP2.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotXorROP2.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotXorROP3.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotXorROP3.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NotXorROP3.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotXorROP3.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotXorROP4.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotXorROP4.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NotXorROP4.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotXorROP4.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotXorROP5.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotXorROP5.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NotXorROP5.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotXorROP5.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotXorROP6.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotXorROP6.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NotXorROP6.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotXorROP6.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotXorROP7.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotXorROP7.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_NotXorROP7.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotXorROP7.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_OrNotROP0.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrNotROP0.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_OrNotROP0.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrNotROP0.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_OrNotROP1.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrNotROP1.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_OrNotROP1.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrNotROP1.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_OrNotROP2.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrNotROP2.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_OrNotROP2.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrNotROP2.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_OrNotROP3.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrNotROP3.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_OrNotROP3.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrNotROP3.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_OrNotROP4.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrNotROP4.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_OrNotROP4.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrNotROP4.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_OrNotROP5.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrNotROP5.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_OrNotROP5.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrNotROP5.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_OrNotROP6.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrNotROP6.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_OrNotROP6.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrNotROP6.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_OrNotROP7.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrNotROP7.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_OrNotROP7.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrNotROP7.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_OrROP0.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrROP0.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_OrROP0.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrROP0.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_OrROP1.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrROP1.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_OrROP1.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrROP1.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_OrROP2.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrROP2.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_OrROP2.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrROP2.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_OrROP3.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrROP3.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_OrROP3.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrROP3.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_OrROP4.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrROP4.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_OrROP4.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrROP4.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_OrROP5.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrROP5.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_OrROP5.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrROP5.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_OrROP6.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrROP6.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_OrROP6.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrROP6.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_OrROP7.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrROP7.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_OrROP7.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrROP7.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_SetROP0.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_SetROP0.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_SetROP0.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_SetROP0.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_SetROP1.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_SetROP1.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_SetROP1.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_SetROP1.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_SetROP2.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_SetROP2.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_SetROP2.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_SetROP2.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_SetROP3.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_SetROP3.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_SetROP3.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_SetROP3.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_SetROP4.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_SetROP4.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_SetROP4.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_SetROP4.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_SetROP5.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_SetROP5.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_SetROP5.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_SetROP5.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_SetROP6.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_SetROP6.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_SetROP6.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_SetROP6.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_SetROP7.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_SetROP7.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_SetROP7.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_SetROP7.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_XorROP0.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_XorROP0.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_XorROP0.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_XorROP0.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_XorROP1.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_XorROP1.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_XorROP1.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_XorROP1.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_XorROP2.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_XorROP2.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_XorROP2.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_XorROP2.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_XorROP3.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_XorROP3.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_XorROP3.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_XorROP3.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_XorROP4.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_XorROP4.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_XorROP4.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_XorROP4.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_XorROP5.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_XorROP5.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_XorROP5.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_XorROP5.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_XorROP6.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_XorROP6.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_XorROP6.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_XorROP6.png diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_XorROP7.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_XorROP7.png similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/res/res_XorROP7.png rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_XorROP7.png diff --git a/tests/auto/qpainter/drawPixmap_rop/src1.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop/src1.xbm similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/src1.xbm rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/src1.xbm diff --git a/tests/auto/qpainter/drawPixmap_rop/src2-mask.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop/src2-mask.xbm similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/src2-mask.xbm rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/src2-mask.xbm diff --git a/tests/auto/qpainter/drawPixmap_rop/src2.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop/src2.xbm similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/src2.xbm rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/src2.xbm diff --git a/tests/auto/qpainter/drawPixmap_rop/src3.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop/src3.xbm similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop/src3.xbm rename to tests/auto/gui/painting/qpainter/drawPixmap_rop/src3.xbm diff --git a/tests/auto/qpainter/drawPixmap_rop_bitmap/dst.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/dst.xbm similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop_bitmap/dst.xbm rename to tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/dst.xbm diff --git a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_AndNotROP.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_AndNotROP.xbm similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_AndNotROP.xbm rename to tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_AndNotROP.xbm diff --git a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_AndROP.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_AndROP.xbm similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_AndROP.xbm rename to tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_AndROP.xbm diff --git a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_ClearROP.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_ClearROP.xbm similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_ClearROP.xbm rename to tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_ClearROP.xbm diff --git a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_CopyROP.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_CopyROP.xbm similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_CopyROP.xbm rename to tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_CopyROP.xbm diff --git a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_NandROP.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_NandROP.xbm similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_NandROP.xbm rename to tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_NandROP.xbm diff --git a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_NopROP.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_NopROP.xbm similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_NopROP.xbm rename to tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_NopROP.xbm diff --git a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_NorROP.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_NorROP.xbm similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_NorROP.xbm rename to tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_NorROP.xbm diff --git a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_NotAndROP.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_NotAndROP.xbm similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_NotAndROP.xbm rename to tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_NotAndROP.xbm diff --git a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_NotCopyROP.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_NotCopyROP.xbm similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_NotCopyROP.xbm rename to tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_NotCopyROP.xbm diff --git a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_NotOrROP.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_NotOrROP.xbm similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_NotOrROP.xbm rename to tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_NotOrROP.xbm diff --git a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_NotROP.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_NotROP.xbm similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_NotROP.xbm rename to tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_NotROP.xbm diff --git a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_NotXorROP.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_NotXorROP.xbm similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_NotXorROP.xbm rename to tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_NotXorROP.xbm diff --git a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_OrNotROP.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_OrNotROP.xbm similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_OrNotROP.xbm rename to tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_OrNotROP.xbm diff --git a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_OrROP.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_OrROP.xbm similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_OrROP.xbm rename to tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_OrROP.xbm diff --git a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_SetROP.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_SetROP.xbm similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_SetROP.xbm rename to tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_SetROP.xbm diff --git a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_XorROP.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_XorROP.xbm similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_XorROP.xbm rename to tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_XorROP.xbm diff --git a/tests/auto/qpainter/drawPixmap_rop_bitmap/src1-mask.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/src1-mask.xbm similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop_bitmap/src1-mask.xbm rename to tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/src1-mask.xbm diff --git a/tests/auto/qpainter/drawPixmap_rop_bitmap/src1.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/src1.xbm similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop_bitmap/src1.xbm rename to tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/src1.xbm diff --git a/tests/auto/qpainter/drawPixmap_rop_bitmap/src2.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/src2.xbm similarity index 100% rename from tests/auto/qpainter/drawPixmap_rop_bitmap/src2.xbm rename to tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/src2.xbm diff --git a/tests/auto/qpainter/qpainter.pro b/tests/auto/gui/painting/qpainter/qpainter.pro similarity index 100% rename from tests/auto/qpainter/qpainter.pro rename to tests/auto/gui/painting/qpainter/qpainter.pro diff --git a/tests/auto/qpainter/task217400.png b/tests/auto/gui/painting/qpainter/task217400.png similarity index 100% rename from tests/auto/qpainter/task217400.png rename to tests/auto/gui/painting/qpainter/task217400.png diff --git a/tests/auto/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp similarity index 99% rename from tests/auto/qpainter/tst_qpainter.cpp rename to tests/auto/gui/painting/qpainter/tst_qpainter.cpp index ff4f7ad8ebd..c2c90020232 100644 --- a/tests/auto/qpainter/tst_qpainter.cpp +++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp @@ -41,7 +41,7 @@ #include -#include "../../shared/util.h" +#include "../../../../shared/util.h" #include #include diff --git a/tests/auto/qpainter/utils/createImages/createImages.pro b/tests/auto/gui/painting/qpainter/utils/createImages/createImages.pro similarity index 100% rename from tests/auto/qpainter/utils/createImages/createImages.pro rename to tests/auto/gui/painting/qpainter/utils/createImages/createImages.pro diff --git a/tests/auto/qpainter/utils/createImages/main.cpp b/tests/auto/gui/painting/qpainter/utils/createImages/main.cpp similarity index 100% rename from tests/auto/qpainter/utils/createImages/main.cpp rename to tests/auto/gui/painting/qpainter/utils/createImages/main.cpp diff --git a/tests/auto/qpainterpath/.gitignore b/tests/auto/gui/painting/qpainterpath/.gitignore similarity index 100% rename from tests/auto/qpainterpath/.gitignore rename to tests/auto/gui/painting/qpainterpath/.gitignore diff --git a/tests/auto/qpainterpath/qpainterpath.pro b/tests/auto/gui/painting/qpainterpath/qpainterpath.pro similarity index 100% rename from tests/auto/qpainterpath/qpainterpath.pro rename to tests/auto/gui/painting/qpainterpath/qpainterpath.pro diff --git a/tests/auto/qpainterpath/tst_qpainterpath.cpp b/tests/auto/gui/painting/qpainterpath/tst_qpainterpath.cpp similarity index 100% rename from tests/auto/qpainterpath/tst_qpainterpath.cpp rename to tests/auto/gui/painting/qpainterpath/tst_qpainterpath.cpp diff --git a/tests/auto/qpainterpathstroker/.gitignore b/tests/auto/gui/painting/qpainterpathstroker/.gitignore similarity index 100% rename from tests/auto/qpainterpathstroker/.gitignore rename to tests/auto/gui/painting/qpainterpathstroker/.gitignore diff --git a/tests/auto/qpainterpathstroker/qpainterpathstroker.pro b/tests/auto/gui/painting/qpainterpathstroker/qpainterpathstroker.pro similarity index 100% rename from tests/auto/qpainterpathstroker/qpainterpathstroker.pro rename to tests/auto/gui/painting/qpainterpathstroker/qpainterpathstroker.pro diff --git a/tests/auto/qpainterpathstroker/tst_qpainterpathstroker.cpp b/tests/auto/gui/painting/qpainterpathstroker/tst_qpainterpathstroker.cpp similarity index 100% rename from tests/auto/qpainterpathstroker/tst_qpainterpathstroker.cpp rename to tests/auto/gui/painting/qpainterpathstroker/tst_qpainterpathstroker.cpp diff --git a/tests/auto/qpathclipper/.gitignore b/tests/auto/gui/painting/qpathclipper/.gitignore similarity index 100% rename from tests/auto/qpathclipper/.gitignore rename to tests/auto/gui/painting/qpathclipper/.gitignore diff --git a/tests/auto/qpathclipper/pathcompare.h b/tests/auto/gui/painting/qpathclipper/pathcompare.h similarity index 100% rename from tests/auto/qpathclipper/pathcompare.h rename to tests/auto/gui/painting/qpathclipper/pathcompare.h diff --git a/tests/auto/qpathclipper/paths.cpp b/tests/auto/gui/painting/qpathclipper/paths.cpp similarity index 100% rename from tests/auto/qpathclipper/paths.cpp rename to tests/auto/gui/painting/qpathclipper/paths.cpp diff --git a/tests/auto/qpathclipper/paths.h b/tests/auto/gui/painting/qpathclipper/paths.h similarity index 100% rename from tests/auto/qpathclipper/paths.h rename to tests/auto/gui/painting/qpathclipper/paths.h diff --git a/tests/auto/qpathclipper/qpathclipper.pro b/tests/auto/gui/painting/qpathclipper/qpathclipper.pro similarity index 100% rename from tests/auto/qpathclipper/qpathclipper.pro rename to tests/auto/gui/painting/qpathclipper/qpathclipper.pro diff --git a/tests/auto/qpathclipper/tst_qpathclipper.cpp b/tests/auto/gui/painting/qpathclipper/tst_qpathclipper.cpp similarity index 100% rename from tests/auto/qpathclipper/tst_qpathclipper.cpp rename to tests/auto/gui/painting/qpathclipper/tst_qpathclipper.cpp diff --git a/tests/auto/qpen/.gitignore b/tests/auto/gui/painting/qpen/.gitignore similarity index 100% rename from tests/auto/qpen/.gitignore rename to tests/auto/gui/painting/qpen/.gitignore diff --git a/tests/auto/qpen/qpen.pro b/tests/auto/gui/painting/qpen/qpen.pro similarity index 100% rename from tests/auto/qpen/qpen.pro rename to tests/auto/gui/painting/qpen/qpen.pro diff --git a/tests/auto/qpen/tst_qpen.cpp b/tests/auto/gui/painting/qpen/tst_qpen.cpp similarity index 100% rename from tests/auto/qpen/tst_qpen.cpp rename to tests/auto/gui/painting/qpen/tst_qpen.cpp diff --git a/tests/auto/qpolygon/.gitignore b/tests/auto/gui/painting/qpolygon/.gitignore similarity index 100% rename from tests/auto/qpolygon/.gitignore rename to tests/auto/gui/painting/qpolygon/.gitignore diff --git a/tests/auto/qpolygon/qpolygon.pro b/tests/auto/gui/painting/qpolygon/qpolygon.pro similarity index 100% rename from tests/auto/qpolygon/qpolygon.pro rename to tests/auto/gui/painting/qpolygon/qpolygon.pro diff --git a/tests/auto/qpolygon/tst_qpolygon.cpp b/tests/auto/gui/painting/qpolygon/tst_qpolygon.cpp similarity index 100% rename from tests/auto/qpolygon/tst_qpolygon.cpp rename to tests/auto/gui/painting/qpolygon/tst_qpolygon.cpp diff --git a/tests/auto/qprinter/.gitignore b/tests/auto/gui/painting/qprinter/.gitignore similarity index 100% rename from tests/auto/qprinter/.gitignore rename to tests/auto/gui/painting/qprinter/.gitignore diff --git a/tests/auto/qprinter/qprinter.pro b/tests/auto/gui/painting/qprinter/qprinter.pro similarity index 100% rename from tests/auto/qprinter/qprinter.pro rename to tests/auto/gui/painting/qprinter/qprinter.pro diff --git a/tests/auto/qprinter/tst_qprinter.cpp b/tests/auto/gui/painting/qprinter/tst_qprinter.cpp similarity index 100% rename from tests/auto/qprinter/tst_qprinter.cpp rename to tests/auto/gui/painting/qprinter/tst_qprinter.cpp diff --git a/tests/auto/qprinterinfo/.gitignore b/tests/auto/gui/painting/qprinterinfo/.gitignore similarity index 100% rename from tests/auto/qprinterinfo/.gitignore rename to tests/auto/gui/painting/qprinterinfo/.gitignore diff --git a/tests/auto/qprinterinfo/qprinterinfo.pro b/tests/auto/gui/painting/qprinterinfo/qprinterinfo.pro similarity index 100% rename from tests/auto/qprinterinfo/qprinterinfo.pro rename to tests/auto/gui/painting/qprinterinfo/qprinterinfo.pro diff --git a/tests/auto/qprinterinfo/tst_qprinterinfo.cpp b/tests/auto/gui/painting/qprinterinfo/tst_qprinterinfo.cpp similarity index 100% rename from tests/auto/qprinterinfo/tst_qprinterinfo.cpp rename to tests/auto/gui/painting/qprinterinfo/tst_qprinterinfo.cpp diff --git a/tests/auto/qregion/.gitignore b/tests/auto/gui/painting/qregion/.gitignore similarity index 100% rename from tests/auto/qregion/.gitignore rename to tests/auto/gui/painting/qregion/.gitignore diff --git a/tests/auto/qregion/qregion.pro b/tests/auto/gui/painting/qregion/qregion.pro similarity index 100% rename from tests/auto/qregion/qregion.pro rename to tests/auto/gui/painting/qregion/qregion.pro diff --git a/tests/auto/qregion/tst_qregion.cpp b/tests/auto/gui/painting/qregion/tst_qregion.cpp similarity index 100% rename from tests/auto/qregion/tst_qregion.cpp rename to tests/auto/gui/painting/qregion/tst_qregion.cpp diff --git a/tests/auto/qtransform/.gitignore b/tests/auto/gui/painting/qtransform/.gitignore similarity index 100% rename from tests/auto/qtransform/.gitignore rename to tests/auto/gui/painting/qtransform/.gitignore diff --git a/tests/auto/qtransform/qtransform.pro b/tests/auto/gui/painting/qtransform/qtransform.pro similarity index 100% rename from tests/auto/qtransform/qtransform.pro rename to tests/auto/gui/painting/qtransform/qtransform.pro diff --git a/tests/auto/qtransform/tst_qtransform.cpp b/tests/auto/gui/painting/qtransform/tst_qtransform.cpp similarity index 100% rename from tests/auto/qtransform/tst_qtransform.cpp rename to tests/auto/gui/painting/qtransform/tst_qtransform.cpp diff --git a/tests/auto/qwmatrix/.gitignore b/tests/auto/gui/painting/qwmatrix/.gitignore similarity index 100% rename from tests/auto/qwmatrix/.gitignore rename to tests/auto/gui/painting/qwmatrix/.gitignore diff --git a/tests/auto/qwmatrix/qwmatrix.pro b/tests/auto/gui/painting/qwmatrix/qwmatrix.pro similarity index 100% rename from tests/auto/qwmatrix/qwmatrix.pro rename to tests/auto/gui/painting/qwmatrix/qwmatrix.pro diff --git a/tests/auto/qwmatrix/tst_qwmatrix.cpp b/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp similarity index 100% rename from tests/auto/qwmatrix/tst_qwmatrix.cpp rename to tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp diff --git a/tests/auto/qabstracttextdocumentlayout/.gitignore b/tests/auto/gui/text/qabstracttextdocumentlayout/.gitignore similarity index 100% rename from tests/auto/qabstracttextdocumentlayout/.gitignore rename to tests/auto/gui/text/qabstracttextdocumentlayout/.gitignore diff --git a/tests/auto/qabstracttextdocumentlayout/qabstracttextdocumentlayout.pro b/tests/auto/gui/text/qabstracttextdocumentlayout/qabstracttextdocumentlayout.pro similarity index 100% rename from tests/auto/qabstracttextdocumentlayout/qabstracttextdocumentlayout.pro rename to tests/auto/gui/text/qabstracttextdocumentlayout/qabstracttextdocumentlayout.pro diff --git a/tests/auto/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp b/tests/auto/gui/text/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp similarity index 100% rename from tests/auto/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp rename to tests/auto/gui/text/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp diff --git a/tests/auto/qcssparser/.gitignore b/tests/auto/gui/text/qcssparser/.gitignore similarity index 100% rename from tests/auto/qcssparser/.gitignore rename to tests/auto/gui/text/qcssparser/.gitignore diff --git a/tests/auto/qcssparser/qcssparser.pro b/tests/auto/gui/text/qcssparser/qcssparser.pro similarity index 100% rename from tests/auto/qcssparser/qcssparser.pro rename to tests/auto/gui/text/qcssparser/qcssparser.pro diff --git a/tests/auto/qcssparser/testdata/scanner/comments/input b/tests/auto/gui/text/qcssparser/testdata/scanner/comments/input similarity index 100% rename from tests/auto/qcssparser/testdata/scanner/comments/input rename to tests/auto/gui/text/qcssparser/testdata/scanner/comments/input diff --git a/tests/auto/qcssparser/testdata/scanner/comments/output b/tests/auto/gui/text/qcssparser/testdata/scanner/comments/output similarity index 100% rename from tests/auto/qcssparser/testdata/scanner/comments/output rename to tests/auto/gui/text/qcssparser/testdata/scanner/comments/output diff --git a/tests/auto/qcssparser/testdata/scanner/comments2/input b/tests/auto/gui/text/qcssparser/testdata/scanner/comments2/input similarity index 100% rename from tests/auto/qcssparser/testdata/scanner/comments2/input rename to tests/auto/gui/text/qcssparser/testdata/scanner/comments2/input diff --git a/tests/auto/qcssparser/testdata/scanner/comments2/output b/tests/auto/gui/text/qcssparser/testdata/scanner/comments2/output similarity index 100% rename from tests/auto/qcssparser/testdata/scanner/comments2/output rename to tests/auto/gui/text/qcssparser/testdata/scanner/comments2/output diff --git a/tests/auto/qcssparser/testdata/scanner/comments3/input b/tests/auto/gui/text/qcssparser/testdata/scanner/comments3/input similarity index 100% rename from tests/auto/qcssparser/testdata/scanner/comments3/input rename to tests/auto/gui/text/qcssparser/testdata/scanner/comments3/input diff --git a/tests/auto/qcssparser/testdata/scanner/comments3/output b/tests/auto/gui/text/qcssparser/testdata/scanner/comments3/output similarity index 100% rename from tests/auto/qcssparser/testdata/scanner/comments3/output rename to tests/auto/gui/text/qcssparser/testdata/scanner/comments3/output diff --git a/tests/auto/qcssparser/testdata/scanner/comments4/input b/tests/auto/gui/text/qcssparser/testdata/scanner/comments4/input similarity index 100% rename from tests/auto/qcssparser/testdata/scanner/comments4/input rename to tests/auto/gui/text/qcssparser/testdata/scanner/comments4/input diff --git a/tests/auto/qcssparser/testdata/scanner/comments4/output b/tests/auto/gui/text/qcssparser/testdata/scanner/comments4/output similarity index 100% rename from tests/auto/qcssparser/testdata/scanner/comments4/output rename to tests/auto/gui/text/qcssparser/testdata/scanner/comments4/output diff --git a/tests/auto/qcssparser/testdata/scanner/quotedstring/input b/tests/auto/gui/text/qcssparser/testdata/scanner/quotedstring/input similarity index 100% rename from tests/auto/qcssparser/testdata/scanner/quotedstring/input rename to tests/auto/gui/text/qcssparser/testdata/scanner/quotedstring/input diff --git a/tests/auto/qcssparser/testdata/scanner/quotedstring/output b/tests/auto/gui/text/qcssparser/testdata/scanner/quotedstring/output similarity index 100% rename from tests/auto/qcssparser/testdata/scanner/quotedstring/output rename to tests/auto/gui/text/qcssparser/testdata/scanner/quotedstring/output diff --git a/tests/auto/qcssparser/testdata/scanner/simple/input b/tests/auto/gui/text/qcssparser/testdata/scanner/simple/input similarity index 100% rename from tests/auto/qcssparser/testdata/scanner/simple/input rename to tests/auto/gui/text/qcssparser/testdata/scanner/simple/input diff --git a/tests/auto/qcssparser/testdata/scanner/simple/output b/tests/auto/gui/text/qcssparser/testdata/scanner/simple/output similarity index 100% rename from tests/auto/qcssparser/testdata/scanner/simple/output rename to tests/auto/gui/text/qcssparser/testdata/scanner/simple/output diff --git a/tests/auto/qcssparser/testdata/scanner/unicode/input b/tests/auto/gui/text/qcssparser/testdata/scanner/unicode/input similarity index 100% rename from tests/auto/qcssparser/testdata/scanner/unicode/input rename to tests/auto/gui/text/qcssparser/testdata/scanner/unicode/input diff --git a/tests/auto/qcssparser/testdata/scanner/unicode/output b/tests/auto/gui/text/qcssparser/testdata/scanner/unicode/output similarity index 100% rename from tests/auto/qcssparser/testdata/scanner/unicode/output rename to tests/auto/gui/text/qcssparser/testdata/scanner/unicode/output diff --git a/tests/auto/qcssparser/tst_qcssparser.cpp b/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp similarity index 100% rename from tests/auto/qcssparser/tst_qcssparser.cpp rename to tests/auto/gui/text/qcssparser/tst_qcssparser.cpp diff --git a/tests/auto/qfont/.gitignore b/tests/auto/gui/text/qfont/.gitignore similarity index 100% rename from tests/auto/qfont/.gitignore rename to tests/auto/gui/text/qfont/.gitignore diff --git a/tests/auto/qfont/qfont.pro b/tests/auto/gui/text/qfont/qfont.pro similarity index 100% rename from tests/auto/qfont/qfont.pro rename to tests/auto/gui/text/qfont/qfont.pro diff --git a/tests/auto/qfont/tst_qfont.cpp b/tests/auto/gui/text/qfont/tst_qfont.cpp similarity index 100% rename from tests/auto/qfont/tst_qfont.cpp rename to tests/auto/gui/text/qfont/tst_qfont.cpp diff --git a/tests/auto/qfontdatabase/.gitignore b/tests/auto/gui/text/qfontdatabase/.gitignore similarity index 100% rename from tests/auto/qfontdatabase/.gitignore rename to tests/auto/gui/text/qfontdatabase/.gitignore diff --git a/tests/auto/qfontdatabase/FreeMono.ttf b/tests/auto/gui/text/qfontdatabase/FreeMono.ttf similarity index 100% rename from tests/auto/qfontdatabase/FreeMono.ttf rename to tests/auto/gui/text/qfontdatabase/FreeMono.ttf diff --git a/tests/auto/qfontdatabase/qfontdatabase.pro b/tests/auto/gui/text/qfontdatabase/qfontdatabase.pro similarity index 100% rename from tests/auto/qfontdatabase/qfontdatabase.pro rename to tests/auto/gui/text/qfontdatabase/qfontdatabase.pro diff --git a/tests/auto/qfontdatabase/tst_qfontdatabase.cpp b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp similarity index 100% rename from tests/auto/qfontdatabase/tst_qfontdatabase.cpp rename to tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp diff --git a/tests/auto/qfontmetrics/.gitignore b/tests/auto/gui/text/qfontmetrics/.gitignore similarity index 100% rename from tests/auto/qfontmetrics/.gitignore rename to tests/auto/gui/text/qfontmetrics/.gitignore diff --git a/tests/auto/qfontmetrics/qfontmetrics.pro b/tests/auto/gui/text/qfontmetrics/qfontmetrics.pro similarity index 100% rename from tests/auto/qfontmetrics/qfontmetrics.pro rename to tests/auto/gui/text/qfontmetrics/qfontmetrics.pro diff --git a/tests/auto/qfontmetrics/testfont.qrc b/tests/auto/gui/text/qfontmetrics/testfont.qrc similarity index 100% rename from tests/auto/qfontmetrics/testfont.qrc rename to tests/auto/gui/text/qfontmetrics/testfont.qrc diff --git a/tests/auto/qfontmetrics/tst_qfontmetrics.cpp b/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp similarity index 100% rename from tests/auto/qfontmetrics/tst_qfontmetrics.cpp rename to tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp diff --git a/tests/auto/qfontmetrics/ucs4font.ttf b/tests/auto/gui/text/qfontmetrics/ucs4font.ttf similarity index 100% rename from tests/auto/qfontmetrics/ucs4font.ttf rename to tests/auto/gui/text/qfontmetrics/ucs4font.ttf diff --git a/tests/auto/qglyphrun/qglyphrun.pro b/tests/auto/gui/text/qglyphrun/qglyphrun.pro similarity index 100% rename from tests/auto/qglyphrun/qglyphrun.pro rename to tests/auto/gui/text/qglyphrun/qglyphrun.pro diff --git a/tests/auto/qglyphrun/test.ttf b/tests/auto/gui/text/qglyphrun/test.ttf similarity index 100% rename from tests/auto/qglyphrun/test.ttf rename to tests/auto/gui/text/qglyphrun/test.ttf diff --git a/tests/auto/qglyphrun/tst_qglyphrun.cpp b/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp similarity index 100% rename from tests/auto/qglyphrun/tst_qglyphrun.cpp rename to tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp diff --git a/tests/auto/qrawfont/qrawfont.pro b/tests/auto/gui/text/qrawfont/qrawfont.pro similarity index 100% rename from tests/auto/qrawfont/qrawfont.pro rename to tests/auto/gui/text/qrawfont/qrawfont.pro diff --git a/tests/auto/qrawfont/testfont.ttf b/tests/auto/gui/text/qrawfont/testfont.ttf similarity index 100% rename from tests/auto/qrawfont/testfont.ttf rename to tests/auto/gui/text/qrawfont/testfont.ttf diff --git a/tests/auto/qrawfont/testfont_bold_italic.ttf b/tests/auto/gui/text/qrawfont/testfont_bold_italic.ttf similarity index 100% rename from tests/auto/qrawfont/testfont_bold_italic.ttf rename to tests/auto/gui/text/qrawfont/testfont_bold_italic.ttf diff --git a/tests/auto/qrawfont/tst_qrawfont.cpp b/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp similarity index 100% rename from tests/auto/qrawfont/tst_qrawfont.cpp rename to tests/auto/gui/text/qrawfont/tst_qrawfont.cpp diff --git a/tests/auto/qstatictext/qstatictext.pro b/tests/auto/gui/text/qstatictext/qstatictext.pro similarity index 100% rename from tests/auto/qstatictext/qstatictext.pro rename to tests/auto/gui/text/qstatictext/qstatictext.pro diff --git a/tests/auto/qstatictext/tst_qstatictext.cpp b/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp similarity index 100% rename from tests/auto/qstatictext/tst_qstatictext.cpp rename to tests/auto/gui/text/qstatictext/tst_qstatictext.cpp diff --git a/tests/auto/qsyntaxhighlighter/.gitignore b/tests/auto/gui/text/qsyntaxhighlighter/.gitignore similarity index 100% rename from tests/auto/qsyntaxhighlighter/.gitignore rename to tests/auto/gui/text/qsyntaxhighlighter/.gitignore diff --git a/tests/auto/qsyntaxhighlighter/qsyntaxhighlighter.pro b/tests/auto/gui/text/qsyntaxhighlighter/qsyntaxhighlighter.pro similarity index 100% rename from tests/auto/qsyntaxhighlighter/qsyntaxhighlighter.pro rename to tests/auto/gui/text/qsyntaxhighlighter/qsyntaxhighlighter.pro diff --git a/tests/auto/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp b/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp similarity index 100% rename from tests/auto/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp rename to tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp diff --git a/tests/auto/qtextblock/.gitignore b/tests/auto/gui/text/qtextblock/.gitignore similarity index 100% rename from tests/auto/qtextblock/.gitignore rename to tests/auto/gui/text/qtextblock/.gitignore diff --git a/tests/auto/qtextblock/qtextblock.pro b/tests/auto/gui/text/qtextblock/qtextblock.pro similarity index 100% rename from tests/auto/qtextblock/qtextblock.pro rename to tests/auto/gui/text/qtextblock/qtextblock.pro diff --git a/tests/auto/qtextblock/tst_qtextblock.cpp b/tests/auto/gui/text/qtextblock/tst_qtextblock.cpp similarity index 100% rename from tests/auto/qtextblock/tst_qtextblock.cpp rename to tests/auto/gui/text/qtextblock/tst_qtextblock.cpp diff --git a/tests/auto/qtextcursor/.gitignore b/tests/auto/gui/text/qtextcursor/.gitignore similarity index 100% rename from tests/auto/qtextcursor/.gitignore rename to tests/auto/gui/text/qtextcursor/.gitignore diff --git a/tests/auto/qtextcursor/qtextcursor.pro b/tests/auto/gui/text/qtextcursor/qtextcursor.pro similarity index 100% rename from tests/auto/qtextcursor/qtextcursor.pro rename to tests/auto/gui/text/qtextcursor/qtextcursor.pro diff --git a/tests/auto/qtextcursor/tst_qtextcursor.cpp b/tests/auto/gui/text/qtextcursor/tst_qtextcursor.cpp similarity index 100% rename from tests/auto/qtextcursor/tst_qtextcursor.cpp rename to tests/auto/gui/text/qtextcursor/tst_qtextcursor.cpp diff --git a/tests/auto/qtextdocument/.gitignore b/tests/auto/gui/text/qtextdocument/.gitignore similarity index 100% rename from tests/auto/qtextdocument/.gitignore rename to tests/auto/gui/text/qtextdocument/.gitignore diff --git a/tests/auto/qtextdocument/common.h b/tests/auto/gui/text/qtextdocument/common.h similarity index 100% rename from tests/auto/qtextdocument/common.h rename to tests/auto/gui/text/qtextdocument/common.h diff --git a/tests/auto/qtextdocument/qtextdocument.pro b/tests/auto/gui/text/qtextdocument/qtextdocument.pro similarity index 100% rename from tests/auto/qtextdocument/qtextdocument.pro rename to tests/auto/gui/text/qtextdocument/qtextdocument.pro diff --git a/tests/auto/qtextdocument/tst_qtextdocument.cpp b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp similarity index 100% rename from tests/auto/qtextdocument/tst_qtextdocument.cpp rename to tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp diff --git a/tests/auto/qtextdocumentfragment/.gitignore b/tests/auto/gui/text/qtextdocumentfragment/.gitignore similarity index 100% rename from tests/auto/qtextdocumentfragment/.gitignore rename to tests/auto/gui/text/qtextdocumentfragment/.gitignore diff --git a/tests/auto/qtextdocumentfragment/qtextdocumentfragment.pro b/tests/auto/gui/text/qtextdocumentfragment/qtextdocumentfragment.pro similarity index 100% rename from tests/auto/qtextdocumentfragment/qtextdocumentfragment.pro rename to tests/auto/gui/text/qtextdocumentfragment/qtextdocumentfragment.pro diff --git a/tests/auto/qtextdocumentfragment/tst_qtextdocumentfragment.cpp b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp similarity index 100% rename from tests/auto/qtextdocumentfragment/tst_qtextdocumentfragment.cpp rename to tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp diff --git a/tests/auto/qtextdocumentlayout/.gitignore b/tests/auto/gui/text/qtextdocumentlayout/.gitignore similarity index 100% rename from tests/auto/qtextdocumentlayout/.gitignore rename to tests/auto/gui/text/qtextdocumentlayout/.gitignore diff --git a/tests/auto/qtextdocumentlayout/qtextdocumentlayout.pro b/tests/auto/gui/text/qtextdocumentlayout/qtextdocumentlayout.pro similarity index 100% rename from tests/auto/qtextdocumentlayout/qtextdocumentlayout.pro rename to tests/auto/gui/text/qtextdocumentlayout/qtextdocumentlayout.pro diff --git a/tests/auto/qtextdocumentlayout/tst_qtextdocumentlayout.cpp b/tests/auto/gui/text/qtextdocumentlayout/tst_qtextdocumentlayout.cpp similarity index 100% rename from tests/auto/qtextdocumentlayout/tst_qtextdocumentlayout.cpp rename to tests/auto/gui/text/qtextdocumentlayout/tst_qtextdocumentlayout.cpp diff --git a/tests/auto/qtextformat/.gitignore b/tests/auto/gui/text/qtextformat/.gitignore similarity index 100% rename from tests/auto/qtextformat/.gitignore rename to tests/auto/gui/text/qtextformat/.gitignore diff --git a/tests/auto/qtextformat/qtextformat.pro b/tests/auto/gui/text/qtextformat/qtextformat.pro similarity index 100% rename from tests/auto/qtextformat/qtextformat.pro rename to tests/auto/gui/text/qtextformat/qtextformat.pro diff --git a/tests/auto/qtextformat/tst_qtextformat.cpp b/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp similarity index 100% rename from tests/auto/qtextformat/tst_qtextformat.cpp rename to tests/auto/gui/text/qtextformat/tst_qtextformat.cpp diff --git a/tests/auto/qtextlayout/.gitignore b/tests/auto/gui/text/qtextlayout/.gitignore similarity index 100% rename from tests/auto/qtextlayout/.gitignore rename to tests/auto/gui/text/qtextlayout/.gitignore diff --git a/tests/auto/qtextlayout/qtextlayout.pro b/tests/auto/gui/text/qtextlayout/qtextlayout.pro similarity index 100% rename from tests/auto/qtextlayout/qtextlayout.pro rename to tests/auto/gui/text/qtextlayout/qtextlayout.pro diff --git a/tests/auto/qtextlayout/tst_qtextlayout.cpp b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp similarity index 100% rename from tests/auto/qtextlayout/tst_qtextlayout.cpp rename to tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp diff --git a/tests/auto/qtextlist/.gitignore b/tests/auto/gui/text/qtextlist/.gitignore similarity index 100% rename from tests/auto/qtextlist/.gitignore rename to tests/auto/gui/text/qtextlist/.gitignore diff --git a/tests/auto/qtextlist/qtextlist.pro b/tests/auto/gui/text/qtextlist/qtextlist.pro similarity index 100% rename from tests/auto/qtextlist/qtextlist.pro rename to tests/auto/gui/text/qtextlist/qtextlist.pro diff --git a/tests/auto/qtextlist/tst_qtextlist.cpp b/tests/auto/gui/text/qtextlist/tst_qtextlist.cpp similarity index 100% rename from tests/auto/qtextlist/tst_qtextlist.cpp rename to tests/auto/gui/text/qtextlist/tst_qtextlist.cpp diff --git a/tests/auto/qtextobject/.gitignore b/tests/auto/gui/text/qtextobject/.gitignore similarity index 100% rename from tests/auto/qtextobject/.gitignore rename to tests/auto/gui/text/qtextobject/.gitignore diff --git a/tests/auto/qtextobject/qtextobject.pro b/tests/auto/gui/text/qtextobject/qtextobject.pro similarity index 100% rename from tests/auto/qtextobject/qtextobject.pro rename to tests/auto/gui/text/qtextobject/qtextobject.pro diff --git a/tests/auto/qtextobject/tst_qtextobject.cpp b/tests/auto/gui/text/qtextobject/tst_qtextobject.cpp similarity index 100% rename from tests/auto/qtextobject/tst_qtextobject.cpp rename to tests/auto/gui/text/qtextobject/tst_qtextobject.cpp diff --git a/tests/auto/qtextodfwriter/.gitignore b/tests/auto/gui/text/qtextodfwriter/.gitignore similarity index 100% rename from tests/auto/qtextodfwriter/.gitignore rename to tests/auto/gui/text/qtextodfwriter/.gitignore diff --git a/tests/auto/qtextodfwriter/qtextodfwriter.pro b/tests/auto/gui/text/qtextodfwriter/qtextodfwriter.pro similarity index 83% rename from tests/auto/qtextodfwriter/qtextodfwriter.pro rename to tests/auto/gui/text/qtextodfwriter/qtextodfwriter.pro index f5e2c09fa06..25bb5a5ed0e 100644 --- a/tests/auto/qtextodfwriter/qtextodfwriter.pro +++ b/tests/auto/gui/text/qtextodfwriter/qtextodfwriter.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += core-private gui-private SOURCES += tst_qtextodfwriter.cpp !symbian:DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp b/tests/auto/gui/text/qtextodfwriter/tst_qtextodfwriter.cpp similarity index 100% rename from tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp rename to tests/auto/gui/text/qtextodfwriter/tst_qtextodfwriter.cpp diff --git a/tests/auto/qtextpiecetable/.gitignore b/tests/auto/gui/text/qtextpiecetable/.gitignore similarity index 100% rename from tests/auto/qtextpiecetable/.gitignore rename to tests/auto/gui/text/qtextpiecetable/.gitignore diff --git a/tests/auto/qtextpiecetable/qtextpiecetable.pro b/tests/auto/gui/text/qtextpiecetable/qtextpiecetable.pro similarity index 100% rename from tests/auto/qtextpiecetable/qtextpiecetable.pro rename to tests/auto/gui/text/qtextpiecetable/qtextpiecetable.pro diff --git a/tests/auto/qtextpiecetable/tst_qtextpiecetable.cpp b/tests/auto/gui/text/qtextpiecetable/tst_qtextpiecetable.cpp similarity index 100% rename from tests/auto/qtextpiecetable/tst_qtextpiecetable.cpp rename to tests/auto/gui/text/qtextpiecetable/tst_qtextpiecetable.cpp diff --git a/tests/auto/qtextscriptengine/.gitignore b/tests/auto/gui/text/qtextscriptengine/.gitignore similarity index 100% rename from tests/auto/qtextscriptengine/.gitignore rename to tests/auto/gui/text/qtextscriptengine/.gitignore diff --git a/tests/auto/qtextscriptengine/generate/generate.pro b/tests/auto/gui/text/qtextscriptengine/generate/generate.pro similarity index 100% rename from tests/auto/qtextscriptengine/generate/generate.pro rename to tests/auto/gui/text/qtextscriptengine/generate/generate.pro diff --git a/tests/auto/qtextscriptengine/generate/main.cpp b/tests/auto/gui/text/qtextscriptengine/generate/main.cpp similarity index 100% rename from tests/auto/qtextscriptengine/generate/main.cpp rename to tests/auto/gui/text/qtextscriptengine/generate/main.cpp diff --git a/tests/auto/qtextscriptengine/qtextscriptengine.pro b/tests/auto/gui/text/qtextscriptengine/qtextscriptengine.pro similarity index 100% rename from tests/auto/qtextscriptengine/qtextscriptengine.pro rename to tests/auto/gui/text/qtextscriptengine/qtextscriptengine.pro diff --git a/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp b/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp similarity index 100% rename from tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp rename to tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp diff --git a/tests/auto/qtexttable/.gitignore b/tests/auto/gui/text/qtexttable/.gitignore similarity index 100% rename from tests/auto/qtexttable/.gitignore rename to tests/auto/gui/text/qtexttable/.gitignore diff --git a/tests/auto/qtexttable/qtexttable.pro b/tests/auto/gui/text/qtexttable/qtexttable.pro similarity index 100% rename from tests/auto/qtexttable/qtexttable.pro rename to tests/auto/gui/text/qtexttable/qtexttable.pro diff --git a/tests/auto/qtexttable/tst_qtexttable.cpp b/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp similarity index 100% rename from tests/auto/qtexttable/tst_qtexttable.cpp rename to tests/auto/gui/text/qtexttable/tst_qtexttable.cpp diff --git a/tests/auto/qzip/.gitignore b/tests/auto/gui/text/qzip/.gitignore similarity index 100% rename from tests/auto/qzip/.gitignore rename to tests/auto/gui/text/qzip/.gitignore diff --git a/tests/auto/qzip/qzip.pro b/tests/auto/gui/text/qzip/qzip.pro similarity index 92% rename from tests/auto/qzip/qzip.pro rename to tests/auto/gui/text/qzip/qzip.pro index 683da62e373..7631a3e93ab 100644 --- a/tests/auto/qzip/qzip.pro +++ b/tests/auto/gui/text/qzip/qzip.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += gui-private SOURCES += tst_qzip.cpp wince*|symbian: { diff --git a/tests/auto/qzip/testdata/symlink.zip b/tests/auto/gui/text/qzip/testdata/symlink.zip similarity index 100% rename from tests/auto/qzip/testdata/symlink.zip rename to tests/auto/gui/text/qzip/testdata/symlink.zip diff --git a/tests/auto/qzip/testdata/test.zip b/tests/auto/gui/text/qzip/testdata/test.zip similarity index 100% rename from tests/auto/qzip/testdata/test.zip rename to tests/auto/gui/text/qzip/testdata/test.zip diff --git a/tests/auto/qzip/tst_qzip.cpp b/tests/auto/gui/text/qzip/tst_qzip.cpp similarity index 100% rename from tests/auto/qzip/tst_qzip.cpp rename to tests/auto/gui/text/qzip/tst_qzip.cpp diff --git a/tests/auto/gui/text/text.pro b/tests/auto/gui/text/text.pro new file mode 100644 index 00000000000..001a967ad6a --- /dev/null +++ b/tests/auto/gui/text/text.pro @@ -0,0 +1,32 @@ +TEMPLATE=subdirs +SUBDIRS=\ + qabstracttextdocumentlayout \ + qcssparser \ + qfont \ + qfontdatabase \ + qfontmetrics \ + qglyphrun \ + qrawfont \ + qstatictext \ + qsyntaxhighlighter \ + qtextblock \ + qtextcursor \ + qtextdocument \ + qtextdocumentfragment \ + qtextdocumentlayout \ + qtextformat \ + qtextlayout \ + qtextlist \ + qtextobject \ + qtextpiecetable \ + qtextscriptengine \ + qtexttable \ + +contains(QT_CONFIG, OdfWriter):SUBDIRS += qzip qtextodfwriter + +win32:SUBDIRS -= qtextpiecetable + +!contains(QT_CONFIG, private_tests): SUBDIRS -= \ + qcssparser \ + qtextlayout \ + qtextpiecetable \ diff --git a/tests/auto/qdesktopservices/.gitignore b/tests/auto/gui/util/qdesktopservices/.gitignore similarity index 100% rename from tests/auto/qdesktopservices/.gitignore rename to tests/auto/gui/util/qdesktopservices/.gitignore diff --git a/tests/auto/qdesktopservices/qdesktopservices.pro b/tests/auto/gui/util/qdesktopservices/qdesktopservices.pro similarity index 100% rename from tests/auto/qdesktopservices/qdesktopservices.pro rename to tests/auto/gui/util/qdesktopservices/qdesktopservices.pro diff --git a/tests/auto/qdesktopservices/tst_qdesktopservices.cpp b/tests/auto/gui/util/qdesktopservices/tst_qdesktopservices.cpp similarity index 100% rename from tests/auto/qdesktopservices/tst_qdesktopservices.cpp rename to tests/auto/gui/util/qdesktopservices/tst_qdesktopservices.cpp diff --git a/tests/auto/gui/util/util.pro b/tests/auto/gui/util/util.pro new file mode 100644 index 00000000000..91313ab85eb --- /dev/null +++ b/tests/auto/gui/util/util.pro @@ -0,0 +1,4 @@ +TEMPLATE=subdirs +SUBDIRS=\ + qdesktopservices \ + diff --git a/tests/auto/other.pro b/tests/auto/other.pro index 739174de351..48c5dcccdb0 100644 --- a/tests/auto/other.pro +++ b/tests/auto/other.pro @@ -7,22 +7,15 @@ SUBDIRS=\ lancelot \ qalgorithms \ qcombobox \ - qcssparser \ qfocusevent \ - qimage \ qitemmodel \ qlayout \ qmdiarea \ qmenu \ qmenubar \ - qmouseevent \ - qpainter \ - qpixmap \ - qprinter \ qsplitter \ qtabwidget \ qtextbrowser \ - qtextdocument \ qtextedit \ qtoolbutton \ qvariant \ @@ -32,7 +25,6 @@ SUBDIRS=\ contains(QT_CONFIG, accessibility):SUBDIRS += qaccessibility -contains(QT_CONFIG, OdfWriter):SUBDIRS += qzip qtextodfwriter mac:!qpa { SUBDIRS += macgui \ macnativeevents \ @@ -56,6 +48,4 @@ symbian { # Following tests depends on private API !contains(QT_CONFIG, private_tests): SUBDIRS -= \ qcombobox \ - qcssparser \ qtextedit \ - diff --git a/tests/auto/qgl/qgl.qrc b/tests/auto/qgl/qgl.qrc index 653794a166d..42281afc984 100644 --- a/tests/auto/qgl/qgl.qrc +++ b/tests/auto/qgl/qgl.qrc @@ -1,5 +1,5 @@ - ../qpixmap/images/designer.png + ../gui/image/qpixmap/images/designer.png diff --git a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp index b8741fe3aa2..194e023d05c 100644 --- a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp +++ b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp @@ -50,7 +50,7 @@ #include #include #include "../../shared/util.h" -#include "../qpathclipper/pathcompare.h" +#include "../gui/painting/qpathclipper/pathcompare.h" #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) #include