summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorJo Asplin <jo.asplin@nokia.com>2011-11-25 09:30:03 +0100
committerQt by Nokia <qt-info@nokia.com>2011-11-30 09:30:22 +0100
commit9acec431c360379a21cdbe36d8e342083f344c3c (patch)
treedcd0e4d4d60f7f9cfb6f6d210b6ebaf016573d1b /tests/auto
parent75b66dc8b036c4f4ef3ff8ea109efd698b72732d (diff)
Moved integrationtests/* into other/
Currently there seems to be no precise definition of what an integrationtest is in the context of Qt testing. To avoid confusion, the tests under integrationtests/ are moved into other/ (which is effectively where we keep tests that don't clearly fit into any other category). Tests can be moved back into an integrationtests/ directory at a later point, should an unambiguous definition be established. Change-Id: I3bb289be2dc2aca11b51a8ce8fcc5942f06d6c5c Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/auto.pro1
-rw-r--r--tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro2
-rw-r--r--tests/auto/integrationtests/integrationtests.pro37
-rw-r--r--tests/auto/other/collections/.gitignore (renamed from tests/auto/integrationtests/collections/.gitignore)0
-rw-r--r--tests/auto/other/collections/collections.pro (renamed from tests/auto/integrationtests/collections/collections.pro)0
-rw-r--r--tests/auto/other/collections/tst_collections.cpp (renamed from tests/auto/integrationtests/collections/tst_collections.cpp)0
-rw-r--r--tests/auto/other/exceptionsafety/.gitignore (renamed from tests/auto/integrationtests/exceptionsafety/.gitignore)0
-rw-r--r--tests/auto/other/exceptionsafety/exceptionsafety.pro (renamed from tests/auto/integrationtests/exceptionsafety/exceptionsafety.pro)0
-rw-r--r--tests/auto/other/exceptionsafety/tst_exceptionsafety.cpp (renamed from tests/auto/integrationtests/exceptionsafety/tst_exceptionsafety.cpp)0
-rw-r--r--tests/auto/other/exceptionsafety_objects/3rdparty/memcheck.h (renamed from tests/auto/integrationtests/exceptionsafety_objects/3rdparty/memcheck.h)0
-rw-r--r--tests/auto/other/exceptionsafety_objects/3rdparty/valgrind.h (renamed from tests/auto/integrationtests/exceptionsafety_objects/3rdparty/valgrind.h)0
-rw-r--r--tests/auto/other/exceptionsafety_objects/exceptionsafety_objects.pro (renamed from tests/auto/integrationtests/exceptionsafety_objects/exceptionsafety_objects.pro)0
-rw-r--r--tests/auto/other/exceptionsafety_objects/oomsimulator.h (renamed from tests/auto/integrationtests/exceptionsafety_objects/oomsimulator.h)0
-rw-r--r--tests/auto/other/exceptionsafety_objects/tst_exceptionsafety_objects.cpp (renamed from tests/auto/integrationtests/exceptionsafety_objects/tst_exceptionsafety_objects.cpp)0
-rw-r--r--tests/auto/other/gestures/gestures.pro (renamed from tests/auto/integrationtests/gestures/gestures.pro)0
-rw-r--r--tests/auto/other/gestures/tst_gestures.cpp (renamed from tests/auto/integrationtests/gestures/tst_gestures.cpp)0
-rw-r--r--tests/auto/other/lancelot/.gitignore (renamed from tests/auto/integrationtests/lancelot/.gitignore)0
-rw-r--r--tests/auto/other/lancelot/images.qrc (renamed from tests/auto/integrationtests/lancelot/images.qrc)0
-rw-r--r--tests/auto/other/lancelot/images/alpha.png (renamed from tests/auto/integrationtests/lancelot/images/alpha.png)bin2422 -> 2422 bytes
-rw-r--r--tests/auto/other/lancelot/images/alpha2x2.png (renamed from tests/auto/integrationtests/lancelot/images/alpha2x2.png)bin169 -> 169 bytes
-rw-r--r--tests/auto/other/lancelot/images/bitmap.png (renamed from tests/auto/integrationtests/lancelot/images/bitmap.png)bin254 -> 254 bytes
-rw-r--r--tests/auto/other/lancelot/images/border.png (renamed from tests/auto/integrationtests/lancelot/images/border.png)bin182 -> 182 bytes
-rw-r--r--tests/auto/other/lancelot/images/borderimage.png (renamed from tests/auto/integrationtests/lancelot/images/borderimage.png)bin826 -> 826 bytes
-rw-r--r--tests/auto/other/lancelot/images/dome_argb32.png (renamed from tests/auto/integrationtests/lancelot/images/dome_argb32.png)bin18234 -> 18234 bytes
-rw-r--r--tests/auto/other/lancelot/images/dome_indexed.png (renamed from tests/auto/integrationtests/lancelot/images/dome_indexed.png)bin7946 -> 7946 bytes
-rw-r--r--tests/auto/other/lancelot/images/dome_indexed_mask.png (renamed from tests/auto/integrationtests/lancelot/images/dome_indexed_mask.png)bin5411 -> 5411 bytes
-rw-r--r--tests/auto/other/lancelot/images/dome_mono.png (renamed from tests/auto/integrationtests/lancelot/images/dome_mono.png)bin1391 -> 1391 bytes
-rw-r--r--tests/auto/other/lancelot/images/dome_mono_128.png (renamed from tests/auto/integrationtests/lancelot/images/dome_mono_128.png)bin2649 -> 2649 bytes
-rw-r--r--tests/auto/other/lancelot/images/dome_mono_palette.png (renamed from tests/auto/integrationtests/lancelot/images/dome_mono_palette.png)bin1404 -> 1404 bytes
-rw-r--r--tests/auto/other/lancelot/images/dome_rgb32.png (renamed from tests/auto/integrationtests/lancelot/images/dome_rgb32.png)bin17890 -> 17890 bytes
-rw-r--r--tests/auto/other/lancelot/images/dot.png (renamed from tests/auto/integrationtests/lancelot/images/dot.png)bin287 -> 287 bytes
-rw-r--r--tests/auto/other/lancelot/images/face.png (renamed from tests/auto/integrationtests/lancelot/images/face.png)bin2414 -> 2414 bytes
-rw-r--r--tests/auto/other/lancelot/images/gam030.png (renamed from tests/auto/integrationtests/lancelot/images/gam030.png)bin213 -> 213 bytes
-rw-r--r--tests/auto/other/lancelot/images/gam045.png (renamed from tests/auto/integrationtests/lancelot/images/gam045.png)bin216 -> 216 bytes
-rw-r--r--tests/auto/other/lancelot/images/gam056.png (renamed from tests/auto/integrationtests/lancelot/images/gam056.png)bin216 -> 216 bytes
-rw-r--r--tests/auto/other/lancelot/images/gam100.png (renamed from tests/auto/integrationtests/lancelot/images/gam100.png)bin205 -> 205 bytes
-rw-r--r--tests/auto/other/lancelot/images/gam200.png (renamed from tests/auto/integrationtests/lancelot/images/gam200.png)bin187 -> 187 bytes
-rw-r--r--tests/auto/other/lancelot/images/image.png (renamed from tests/auto/integrationtests/lancelot/images/image.png)bin169554 -> 169554 bytes
-rw-r--r--tests/auto/other/lancelot/images/mask.png (renamed from tests/auto/integrationtests/lancelot/images/mask.png)bin274 -> 274 bytes
-rw-r--r--tests/auto/other/lancelot/images/mask_100.png (renamed from tests/auto/integrationtests/lancelot/images/mask_100.png)bin319 -> 319 bytes
-rw-r--r--tests/auto/other/lancelot/images/masked.png (renamed from tests/auto/integrationtests/lancelot/images/masked.png)bin788 -> 788 bytes
-rw-r--r--tests/auto/other/lancelot/images/sign.png (renamed from tests/auto/integrationtests/lancelot/images/sign.png)bin10647 -> 10647 bytes
-rw-r--r--tests/auto/other/lancelot/images/solid.png (renamed from tests/auto/integrationtests/lancelot/images/solid.png)bin607 -> 607 bytes
-rw-r--r--tests/auto/other/lancelot/images/solid2x2.png (renamed from tests/auto/integrationtests/lancelot/images/solid2x2.png)bin169 -> 169 bytes
-rw-r--r--tests/auto/other/lancelot/images/struct-image-01.jpg (renamed from tests/auto/integrationtests/lancelot/images/struct-image-01.jpg)bin4751 -> 4751 bytes
-rw-r--r--tests/auto/other/lancelot/images/struct-image-01.png (renamed from tests/auto/integrationtests/lancelot/images/struct-image-01.png)bin63238 -> 63238 bytes
-rw-r--r--tests/auto/other/lancelot/images/zebra.png (renamed from tests/auto/integrationtests/lancelot/images/zebra.png)bin426 -> 426 bytes
-rw-r--r--tests/auto/other/lancelot/lancelot.pro (renamed from tests/auto/integrationtests/lancelot/lancelot.pro)0
-rw-r--r--tests/auto/other/lancelot/paintcommands.cpp (renamed from tests/auto/integrationtests/lancelot/paintcommands.cpp)0
-rw-r--r--tests/auto/other/lancelot/paintcommands.h (renamed from tests/auto/integrationtests/lancelot/paintcommands.h)0
-rw-r--r--tests/auto/other/lancelot/scripts/aliasing.qps (renamed from tests/auto/integrationtests/lancelot/scripts/aliasing.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/arcs.qps (renamed from tests/auto/integrationtests/lancelot/scripts/arcs.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/arcs2.qps (renamed from tests/auto/integrationtests/lancelot/scripts/arcs2.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/background.qps (renamed from tests/auto/integrationtests/lancelot/scripts/background.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/background_brush.qps (renamed from tests/auto/integrationtests/lancelot/scripts/background_brush.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/beziers.qps (renamed from tests/auto/integrationtests/lancelot/scripts/beziers.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/bitmaps.qps (renamed from tests/auto/integrationtests/lancelot/scripts/bitmaps.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/borderimage.qps (renamed from tests/auto/integrationtests/lancelot/scripts/borderimage.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/brush_pens.qps (renamed from tests/auto/integrationtests/lancelot/scripts/brush_pens.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/brushes.qps (renamed from tests/auto/integrationtests/lancelot/scripts/brushes.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/clippaths.qps (renamed from tests/auto/integrationtests/lancelot/scripts/clippaths.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/clipping.qps (renamed from tests/auto/integrationtests/lancelot/scripts/clipping.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/clipping_state.qps (renamed from tests/auto/integrationtests/lancelot/scripts/clipping_state.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/cliprects.qps (renamed from tests/auto/integrationtests/lancelot/scripts/cliprects.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/conical_gradients.qps (renamed from tests/auto/integrationtests/lancelot/scripts/conical_gradients.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/conical_gradients_perspectives.qps (renamed from tests/auto/integrationtests/lancelot/scripts/conical_gradients_perspectives.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/dashes.qps (renamed from tests/auto/integrationtests/lancelot/scripts/dashes.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/degeneratebeziers.qps (renamed from tests/auto/integrationtests/lancelot/scripts/degeneratebeziers.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/deviceclipping.qps (renamed from tests/auto/integrationtests/lancelot/scripts/deviceclipping.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/drawpoints.qps (renamed from tests/auto/integrationtests/lancelot/scripts/drawpoints.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/ellipses.qps (renamed from tests/auto/integrationtests/lancelot/scripts/ellipses.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/filltest.qps (renamed from tests/auto/integrationtests/lancelot/scripts/filltest.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/gradients.qps (renamed from tests/auto/integrationtests/lancelot/scripts/gradients.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/hinting.qps (renamed from tests/auto/integrationtests/lancelot/scripts/hinting.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/image_formats.qps (renamed from tests/auto/integrationtests/lancelot/scripts/image_formats.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/images.qps (renamed from tests/auto/integrationtests/lancelot/scripts/images.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/images2.qps (renamed from tests/auto/integrationtests/lancelot/scripts/images2.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/join_cap_styles.qps (renamed from tests/auto/integrationtests/lancelot/scripts/join_cap_styles.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/join_cap_styles_duplicate_control_points.qps (renamed from tests/auto/integrationtests/lancelot/scripts/join_cap_styles_duplicate_control_points.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/linear_gradients.qps (renamed from tests/auto/integrationtests/lancelot/scripts/linear_gradients.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/linear_gradients_perspectives.qps (renamed from tests/auto/integrationtests/lancelot/scripts/linear_gradients_perspectives.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/linear_resolving_gradients.qps (renamed from tests/auto/integrationtests/lancelot/scripts/linear_resolving_gradients.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/lineconsistency.qps (renamed from tests/auto/integrationtests/lancelot/scripts/lineconsistency.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/linedashes.qps (renamed from tests/auto/integrationtests/lancelot/scripts/linedashes.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/linedashes2.qps (renamed from tests/auto/integrationtests/lancelot/scripts/linedashes2.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/linedashes2_aa.qps (renamed from tests/auto/integrationtests/lancelot/scripts/linedashes2_aa.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/lines.qps (renamed from tests/auto/integrationtests/lancelot/scripts/lines.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/lines2.qps (renamed from tests/auto/integrationtests/lancelot/scripts/lines2.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/pathfill.qps (renamed from tests/auto/integrationtests/lancelot/scripts/pathfill.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/paths.qps (renamed from tests/auto/integrationtests/lancelot/scripts/paths.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/paths_aa.qps (renamed from tests/auto/integrationtests/lancelot/scripts/paths_aa.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/pens.qps (renamed from tests/auto/integrationtests/lancelot/scripts/pens.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/pens_aa.qps (renamed from tests/auto/integrationtests/lancelot/scripts/pens_aa.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/pens_cosmetic.qps (renamed from tests/auto/integrationtests/lancelot/scripts/pens_cosmetic.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/perspectives.qps (renamed from tests/auto/integrationtests/lancelot/scripts/perspectives.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/perspectives2.qps (renamed from tests/auto/integrationtests/lancelot/scripts/perspectives2.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/pixmap_rotation.qps (renamed from tests/auto/integrationtests/lancelot/scripts/pixmap_rotation.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/pixmap_scaling.qps (renamed from tests/auto/integrationtests/lancelot/scripts/pixmap_scaling.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/pixmap_subpixel.qps (renamed from tests/auto/integrationtests/lancelot/scripts/pixmap_subpixel.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/pixmaps.qps (renamed from tests/auto/integrationtests/lancelot/scripts/pixmaps.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/porter_duff.qps (renamed from tests/auto/integrationtests/lancelot/scripts/porter_duff.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/porter_duff2.qps (renamed from tests/auto/integrationtests/lancelot/scripts/porter_duff2.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/primitives.qps (renamed from tests/auto/integrationtests/lancelot/scripts/primitives.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/radial_gradients.qps (renamed from tests/auto/integrationtests/lancelot/scripts/radial_gradients.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/radial_gradients_perspectives.qps (renamed from tests/auto/integrationtests/lancelot/scripts/radial_gradients_perspectives.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/rasterops.qps (renamed from tests/auto/integrationtests/lancelot/scripts/rasterops.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/sizes.qps (renamed from tests/auto/integrationtests/lancelot/scripts/sizes.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/statictext.qps (renamed from tests/auto/integrationtests/lancelot/scripts/statictext.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/text.qps (renamed from tests/auto/integrationtests/lancelot/scripts/text.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/text_perspectives.qps (renamed from tests/auto/integrationtests/lancelot/scripts/text_perspectives.qps)0
-rw-r--r--tests/auto/other/lancelot/scripts/tiled_pixmap.qps (renamed from tests/auto/integrationtests/lancelot/scripts/tiled_pixmap.qps)0
-rw-r--r--tests/auto/other/lancelot/tst_lancelot.cpp (renamed from tests/auto/integrationtests/lancelot/tst_lancelot.cpp)0
-rw-r--r--tests/auto/other/languagechange/.gitignore (renamed from tests/auto/integrationtests/languagechange/.gitignore)0
-rw-r--r--tests/auto/other/languagechange/languagechange.pro (renamed from tests/auto/integrationtests/languagechange/languagechange.pro)0
-rw-r--r--tests/auto/other/languagechange/tst_languagechange.cpp (renamed from tests/auto/integrationtests/languagechange/tst_languagechange.cpp)0
-rw-r--r--tests/auto/other/macgui/.gitignore (renamed from tests/auto/integrationtests/macgui/.gitignore)0
-rw-r--r--tests/auto/other/macgui/guitest.cpp (renamed from tests/auto/integrationtests/macgui/guitest.cpp)0
-rw-r--r--tests/auto/other/macgui/guitest.h (renamed from tests/auto/integrationtests/macgui/guitest.h)0
-rw-r--r--tests/auto/other/macgui/macgui.pro (renamed from tests/auto/integrationtests/macgui/macgui.pro)0
-rw-r--r--tests/auto/other/macgui/tst_macgui.cpp (renamed from tests/auto/integrationtests/macgui/tst_macgui.cpp)0
-rw-r--r--tests/auto/other/macnativeevents/expectedeventlist.cpp (renamed from tests/auto/integrationtests/macnativeevents/expectedeventlist.cpp)0
-rw-r--r--tests/auto/other/macnativeevents/expectedeventlist.h (renamed from tests/auto/integrationtests/macnativeevents/expectedeventlist.h)0
-rw-r--r--tests/auto/other/macnativeevents/macnativeevents.pro (renamed from tests/auto/integrationtests/macnativeevents/macnativeevents.pro)0
-rw-r--r--tests/auto/other/macnativeevents/nativeeventlist.cpp (renamed from tests/auto/integrationtests/macnativeevents/nativeeventlist.cpp)0
-rw-r--r--tests/auto/other/macnativeevents/nativeeventlist.h (renamed from tests/auto/integrationtests/macnativeevents/nativeeventlist.h)0
-rw-r--r--tests/auto/other/macnativeevents/qnativeevents.cpp (renamed from tests/auto/integrationtests/macnativeevents/qnativeevents.cpp)0
-rw-r--r--tests/auto/other/macnativeevents/qnativeevents.h (renamed from tests/auto/integrationtests/macnativeevents/qnativeevents.h)0
-rw-r--r--tests/auto/other/macnativeevents/qnativeevents_mac.cpp (renamed from tests/auto/integrationtests/macnativeevents/qnativeevents_mac.cpp)0
-rw-r--r--tests/auto/other/macnativeevents/tst_macnativeevents.cpp (renamed from tests/auto/integrationtests/macnativeevents/tst_macnativeevents.cpp)0
-rw-r--r--tests/auto/other/macplist/app/app.pro (renamed from tests/auto/integrationtests/macplist/app/app.pro)0
-rw-r--r--tests/auto/other/macplist/app/main.cpp (renamed from tests/auto/integrationtests/macplist/app/main.cpp)0
-rw-r--r--tests/auto/other/macplist/macplist.pro (renamed from tests/auto/integrationtests/macplist/macplist.pro)0
-rw-r--r--tests/auto/other/macplist/test/test.pro (renamed from tests/auto/integrationtests/macplist/test/test.pro)0
-rw-r--r--tests/auto/other/macplist/tst_macplist.cpp (renamed from tests/auto/integrationtests/macplist/tst_macplist.cpp)0
-rw-r--r--tests/auto/other/modeltest/dynamictreemodel.cpp (renamed from tests/auto/integrationtests/modeltest/dynamictreemodel.cpp)0
-rw-r--r--tests/auto/other/modeltest/dynamictreemodel.h (renamed from tests/auto/integrationtests/modeltest/dynamictreemodel.h)0
-rw-r--r--tests/auto/other/modeltest/modeltest.cpp (renamed from tests/auto/integrationtests/modeltest/modeltest.cpp)0
-rw-r--r--tests/auto/other/modeltest/modeltest.h (renamed from tests/auto/integrationtests/modeltest/modeltest.h)0
-rw-r--r--tests/auto/other/modeltest/modeltest.pro (renamed from tests/auto/integrationtests/modeltest/modeltest.pro)0
-rw-r--r--tests/auto/other/modeltest/tst_modeltest.cpp (renamed from tests/auto/integrationtests/modeltest/tst_modeltest.cpp)0
-rw-r--r--tests/auto/other/networkselftest/networkselftest.pro (renamed from tests/auto/integrationtests/networkselftest/networkselftest.pro)0
-rw-r--r--tests/auto/other/networkselftest/rfc3252.txt (renamed from tests/auto/integrationtests/networkselftest/rfc3252.txt)0
-rw-r--r--tests/auto/other/networkselftest/tst_networkselftest.cpp (renamed from tests/auto/integrationtests/networkselftest/tst_networkselftest.cpp)0
-rw-r--r--tests/auto/other/other.pro35
-rw-r--r--tests/auto/other/qaccessibility/.gitignore (renamed from tests/auto/integrationtests/qaccessibility/.gitignore)0
-rw-r--r--tests/auto/other/qaccessibility/qaccessibility.pro (renamed from tests/auto/integrationtests/qaccessibility/qaccessibility.pro)0
-rw-r--r--tests/auto/other/qaccessibility/tst_qaccessibility.cpp (renamed from tests/auto/integrationtests/qaccessibility/tst_qaccessibility.cpp)0
-rw-r--r--tests/auto/other/qcomplextext/.gitignore (renamed from tests/auto/integrationtests/qcomplextext/.gitignore)0
-rw-r--r--tests/auto/other/qcomplextext/bidireorderstring.h (renamed from tests/auto/integrationtests/qcomplextext/bidireorderstring.h)0
-rw-r--r--tests/auto/other/qcomplextext/qcomplextext.pro (renamed from tests/auto/integrationtests/qcomplextext/qcomplextext.pro)0
-rw-r--r--tests/auto/other/qcomplextext/tst_qcomplextext.cpp (renamed from tests/auto/integrationtests/qcomplextext/tst_qcomplextext.cpp)0
-rw-r--r--tests/auto/other/qdirectpainter/.gitignore (renamed from tests/auto/integrationtests/qdirectpainter/.gitignore)0
-rw-r--r--tests/auto/other/qdirectpainter/qdirectpainter.pro (renamed from tests/auto/integrationtests/qdirectpainter/qdirectpainter.pro)0
-rw-r--r--tests/auto/other/qdirectpainter/runDirectPainter/main.cpp (renamed from tests/auto/integrationtests/qdirectpainter/runDirectPainter/main.cpp)0
-rw-r--r--tests/auto/other/qdirectpainter/runDirectPainter/runDirectPainter.pro (renamed from tests/auto/integrationtests/qdirectpainter/runDirectPainter/runDirectPainter.pro)0
-rw-r--r--tests/auto/other/qdirectpainter/test/test.pro (renamed from tests/auto/integrationtests/qdirectpainter/test/test.pro)0
-rw-r--r--tests/auto/other/qdirectpainter/tst_qdirectpainter.cpp (renamed from tests/auto/integrationtests/qdirectpainter/tst_qdirectpainter.cpp)0
-rw-r--r--tests/auto/other/qfocusevent/.gitignore (renamed from tests/auto/integrationtests/qfocusevent/.gitignore)0
-rw-r--r--tests/auto/other/qfocusevent/qfocusevent.pro (renamed from tests/auto/integrationtests/qfocusevent/qfocusevent.pro)0
-rw-r--r--tests/auto/other/qfocusevent/tst_qfocusevent.cpp (renamed from tests/auto/integrationtests/qfocusevent/tst_qfocusevent.cpp)0
-rw-r--r--tests/auto/other/qmultiscreen/.gitignore (renamed from tests/auto/integrationtests/qmultiscreen/.gitignore)0
-rw-r--r--tests/auto/other/qmultiscreen/qmultiscreen.pro (renamed from tests/auto/integrationtests/qmultiscreen/qmultiscreen.pro)0
-rw-r--r--tests/auto/other/qmultiscreen/tst_qmultiscreen.cpp (renamed from tests/auto/integrationtests/qmultiscreen/tst_qmultiscreen.cpp)0
-rw-r--r--tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro (renamed from tests/auto/integrationtests/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro)0
-rw-r--r--tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp (renamed from tests/auto/integrationtests/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp)0
-rw-r--r--tests/auto/other/qobjectrace/.gitignore (renamed from tests/auto/integrationtests/qobjectrace/.gitignore)0
-rw-r--r--tests/auto/other/qobjectrace/qobjectrace.pro (renamed from tests/auto/integrationtests/qobjectrace/qobjectrace.pro)0
-rw-r--r--tests/auto/other/qobjectrace/tst_qobjectrace.cpp (renamed from tests/auto/integrationtests/qobjectrace/tst_qobjectrace.cpp)0
-rw-r--r--tests/auto/other/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro (renamed from tests/auto/integrationtests/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro)0
-rw-r--r--tests/auto/other/qsharedpointer_and_qwidget/tst_qsharedpointer_and_qwidget.cpp (renamed from tests/auto/integrationtests/qsharedpointer_and_qwidget/tst_qsharedpointer_and_qwidget.cpp)0
-rw-r--r--tests/auto/other/windowsmobile/test/ddhelper.cpp (renamed from tests/auto/integrationtests/windowsmobile/test/ddhelper.cpp)0
-rw-r--r--tests/auto/other/windowsmobile/test/ddhelper.h (renamed from tests/auto/integrationtests/windowsmobile/test/ddhelper.h)0
-rw-r--r--tests/auto/other/windowsmobile/test/test.pro (renamed from tests/auto/integrationtests/windowsmobile/test/test.pro)0
-rw-r--r--tests/auto/other/windowsmobile/test/testQMenuBar_current.png (renamed from tests/auto/integrationtests/windowsmobile/test/testQMenuBar_current.png)bin22964 -> 22964 bytes
-rw-r--r--tests/auto/other/windowsmobile/test/testSimpleWidget_current.png (renamed from tests/auto/integrationtests/windowsmobile/test/testSimpleWidget_current.png)bin23841 -> 23841 bytes
-rw-r--r--tests/auto/other/windowsmobile/test/tst_windowsmobile.cpp (renamed from tests/auto/integrationtests/windowsmobile/test/tst_windowsmobile.cpp)0
-rw-r--r--tests/auto/other/windowsmobile/test/windowsmobile.qrc (renamed from tests/auto/integrationtests/windowsmobile/test/windowsmobile.qrc)0
-rw-r--r--tests/auto/other/windowsmobile/testQMenuBar/main.cpp (renamed from tests/auto/integrationtests/windowsmobile/testQMenuBar/main.cpp)0
-rw-r--r--tests/auto/other/windowsmobile/testQMenuBar/testQMenuBar.pro (renamed from tests/auto/integrationtests/windowsmobile/testQMenuBar/testQMenuBar.pro)0
-rw-r--r--tests/auto/other/windowsmobile/windowsmobile.pro (renamed from tests/auto/integrationtests/windowsmobile/windowsmobile.pro)0
-rw-r--r--tests/auto/widgets/itemviews/qidentityproxymodel/qidentityproxymodel.pro2
-rw-r--r--tests/auto/widgets/itemviews/qsortfilterproxymodel/qsortfilterproxymodel.pro2
182 files changed, 38 insertions, 41 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 0ed19dc8c0..8e87e761db 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -4,7 +4,6 @@ SUBDIRS += \
corelib \
dbus \
gui \
- integrationtests \
network \
opengl \
sql \
diff --git a/tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro b/tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro
index e778fefb2a..acf74737a8 100644
--- a/tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro
+++ b/tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro
@@ -2,7 +2,7 @@ CONFIG += testcase
TARGET = tst_qabstractitemmodel
QT += widgets testlib
-mtdir = ../../../integrationtests/modeltest
+mtdir = ../../../other/modeltest
INCLUDEPATH += $$PWD/$${mtdir}
SOURCES = tst_qabstractitemmodel.cpp $${mtdir}/dynamictreemodel.cpp $${mtdir}/modeltest.cpp
HEADERS = $${mtdir}/dynamictreemodel.h $${mtdir}/modeltest.h
diff --git a/tests/auto/integrationtests/integrationtests.pro b/tests/auto/integrationtests/integrationtests.pro
deleted file mode 100644
index df49a12eab..0000000000
--- a/tests/auto/integrationtests/integrationtests.pro
+++ /dev/null
@@ -1,37 +0,0 @@
-TEMPLATE=subdirs
-SUBDIRS=\
- collections \
- exceptionsafety \
- exceptionsafety_objects \
- gestures \
- lancelot \
- languagechange \
- macgui \
- macnativeevents \
- macplist \
- modeltest \
- networkselftest \
- qaccessibility \
- qcomplextext \
- qdirectpainter \
- qfocusevent \
- qmultiscreen \
- qnetworkaccessmanager_and_qprogressdialog \
- qobjectrace \
- qsharedpointer_and_qwidget \
- windowsmobile \
-
-wince*|!contains(QT_CONFIG, accessibility):SUBDIRS -= qaccessibility
-
-!mac: SUBDIRS -= \
- macgui \
- macnativeevents \
- macplist
-
-!embedded|wince*: SUBDIRS -= \
- qdirectpainter \
- qmultiscreen \
-
-!linux*-g++*:SUBDIRS -= exceptionsafety_objects
-
-mac: lancelot.CONFIG = no_check_target # QTBUG-22792
diff --git a/tests/auto/integrationtests/collections/.gitignore b/tests/auto/other/collections/.gitignore
index dcd9d49ec0..dcd9d49ec0 100644
--- a/tests/auto/integrationtests/collections/.gitignore
+++ b/tests/auto/other/collections/.gitignore
diff --git a/tests/auto/integrationtests/collections/collections.pro b/tests/auto/other/collections/collections.pro
index 364ae21858..364ae21858 100644
--- a/tests/auto/integrationtests/collections/collections.pro
+++ b/tests/auto/other/collections/collections.pro
diff --git a/tests/auto/integrationtests/collections/tst_collections.cpp b/tests/auto/other/collections/tst_collections.cpp
index e815ab7896..e815ab7896 100644
--- a/tests/auto/integrationtests/collections/tst_collections.cpp
+++ b/tests/auto/other/collections/tst_collections.cpp
diff --git a/tests/auto/integrationtests/exceptionsafety/.gitignore b/tests/auto/other/exceptionsafety/.gitignore
index 9a854c4c26..9a854c4c26 100644
--- a/tests/auto/integrationtests/exceptionsafety/.gitignore
+++ b/tests/auto/other/exceptionsafety/.gitignore
diff --git a/tests/auto/integrationtests/exceptionsafety/exceptionsafety.pro b/tests/auto/other/exceptionsafety/exceptionsafety.pro
index 66abe49758..66abe49758 100644
--- a/tests/auto/integrationtests/exceptionsafety/exceptionsafety.pro
+++ b/tests/auto/other/exceptionsafety/exceptionsafety.pro
diff --git a/tests/auto/integrationtests/exceptionsafety/tst_exceptionsafety.cpp b/tests/auto/other/exceptionsafety/tst_exceptionsafety.cpp
index ba384e0290..ba384e0290 100644
--- a/tests/auto/integrationtests/exceptionsafety/tst_exceptionsafety.cpp
+++ b/tests/auto/other/exceptionsafety/tst_exceptionsafety.cpp
diff --git a/tests/auto/integrationtests/exceptionsafety_objects/3rdparty/memcheck.h b/tests/auto/other/exceptionsafety_objects/3rdparty/memcheck.h
index 72a02ca9ba..72a02ca9ba 100644
--- a/tests/auto/integrationtests/exceptionsafety_objects/3rdparty/memcheck.h
+++ b/tests/auto/other/exceptionsafety_objects/3rdparty/memcheck.h
diff --git a/tests/auto/integrationtests/exceptionsafety_objects/3rdparty/valgrind.h b/tests/auto/other/exceptionsafety_objects/3rdparty/valgrind.h
index bb054b5fd1..bb054b5fd1 100644
--- a/tests/auto/integrationtests/exceptionsafety_objects/3rdparty/valgrind.h
+++ b/tests/auto/other/exceptionsafety_objects/3rdparty/valgrind.h
diff --git a/tests/auto/integrationtests/exceptionsafety_objects/exceptionsafety_objects.pro b/tests/auto/other/exceptionsafety_objects/exceptionsafety_objects.pro
index adb9bfc1f8..adb9bfc1f8 100644
--- a/tests/auto/integrationtests/exceptionsafety_objects/exceptionsafety_objects.pro
+++ b/tests/auto/other/exceptionsafety_objects/exceptionsafety_objects.pro
diff --git a/tests/auto/integrationtests/exceptionsafety_objects/oomsimulator.h b/tests/auto/other/exceptionsafety_objects/oomsimulator.h
index 15500f590b..15500f590b 100644
--- a/tests/auto/integrationtests/exceptionsafety_objects/oomsimulator.h
+++ b/tests/auto/other/exceptionsafety_objects/oomsimulator.h
diff --git a/tests/auto/integrationtests/exceptionsafety_objects/tst_exceptionsafety_objects.cpp b/tests/auto/other/exceptionsafety_objects/tst_exceptionsafety_objects.cpp
index 304f834cac..304f834cac 100644
--- a/tests/auto/integrationtests/exceptionsafety_objects/tst_exceptionsafety_objects.cpp
+++ b/tests/auto/other/exceptionsafety_objects/tst_exceptionsafety_objects.cpp
diff --git a/tests/auto/integrationtests/gestures/gestures.pro b/tests/auto/other/gestures/gestures.pro
index 0ec0435f62..0ec0435f62 100644
--- a/tests/auto/integrationtests/gestures/gestures.pro
+++ b/tests/auto/other/gestures/gestures.pro
diff --git a/tests/auto/integrationtests/gestures/tst_gestures.cpp b/tests/auto/other/gestures/tst_gestures.cpp
index 63345fbe88..63345fbe88 100644
--- a/tests/auto/integrationtests/gestures/tst_gestures.cpp
+++ b/tests/auto/other/gestures/tst_gestures.cpp
diff --git a/tests/auto/integrationtests/lancelot/.gitignore b/tests/auto/other/lancelot/.gitignore
index 0a70416d57..0a70416d57 100644
--- a/tests/auto/integrationtests/lancelot/.gitignore
+++ b/tests/auto/other/lancelot/.gitignore
diff --git a/tests/auto/integrationtests/lancelot/images.qrc b/tests/auto/other/lancelot/images.qrc
index 060b52c85a..060b52c85a 100644
--- a/tests/auto/integrationtests/lancelot/images.qrc
+++ b/tests/auto/other/lancelot/images.qrc
diff --git a/tests/auto/integrationtests/lancelot/images/alpha.png b/tests/auto/other/lancelot/images/alpha.png
index e465b2586d..e465b2586d 100644
--- a/tests/auto/integrationtests/lancelot/images/alpha.png
+++ b/tests/auto/other/lancelot/images/alpha.png
Binary files differ
diff --git a/tests/auto/integrationtests/lancelot/images/alpha2x2.png b/tests/auto/other/lancelot/images/alpha2x2.png
index 67ecc04286..67ecc04286 100644
--- a/tests/auto/integrationtests/lancelot/images/alpha2x2.png
+++ b/tests/auto/other/lancelot/images/alpha2x2.png
Binary files differ
diff --git a/tests/auto/integrationtests/lancelot/images/bitmap.png b/tests/auto/other/lancelot/images/bitmap.png
index d21f8f51bb..d21f8f51bb 100644
--- a/tests/auto/integrationtests/lancelot/images/bitmap.png
+++ b/tests/auto/other/lancelot/images/bitmap.png
Binary files differ
diff --git a/tests/auto/integrationtests/lancelot/images/border.png b/tests/auto/other/lancelot/images/border.png
index a3d2fed0a3..a3d2fed0a3 100644
--- a/tests/auto/integrationtests/lancelot/images/border.png
+++ b/tests/auto/other/lancelot/images/border.png
Binary files differ
diff --git a/tests/auto/integrationtests/lancelot/images/borderimage.png b/tests/auto/other/lancelot/images/borderimage.png
index f7f6b66227..f7f6b66227 100644
--- a/tests/auto/integrationtests/lancelot/images/borderimage.png
+++ b/tests/auto/other/lancelot/images/borderimage.png
Binary files differ
diff --git a/tests/auto/integrationtests/lancelot/images/dome_argb32.png b/tests/auto/other/lancelot/images/dome_argb32.png
index e3ccba0c13..e3ccba0c13 100644
--- a/tests/auto/integrationtests/lancelot/images/dome_argb32.png
+++ b/tests/auto/other/lancelot/images/dome_argb32.png
Binary files differ
diff --git a/tests/auto/integrationtests/lancelot/images/dome_indexed.png b/tests/auto/other/lancelot/images/dome_indexed.png
index beefcd514e..beefcd514e 100644
--- a/tests/auto/integrationtests/lancelot/images/dome_indexed.png
+++ b/tests/auto/other/lancelot/images/dome_indexed.png
Binary files differ
diff --git a/tests/auto/integrationtests/lancelot/images/dome_indexed_mask.png b/tests/auto/other/lancelot/images/dome_indexed_mask.png
index a62f29f40e..a62f29f40e 100644
--- a/tests/auto/integrationtests/lancelot/images/dome_indexed_mask.png
+++ b/tests/auto/other/lancelot/images/dome_indexed_mask.png
Binary files differ
diff --git a/tests/auto/integrationtests/lancelot/images/dome_mono.png b/tests/auto/other/lancelot/images/dome_mono.png
index 950c2a7494..950c2a7494 100644
--- a/tests/auto/integrationtests/lancelot/images/dome_mono.png
+++ b/tests/auto/other/lancelot/images/dome_mono.png
Binary files differ
diff --git a/tests/auto/integrationtests/lancelot/images/dome_mono_128.png b/tests/auto/other/lancelot/images/dome_mono_128.png
index 77e48aaab7..77e48aaab7 100644
--- a/tests/auto/integrationtests/lancelot/images/dome_mono_128.png
+++ b/tests/auto/other/lancelot/images/dome_mono_128.png
Binary files differ
diff --git a/tests/auto/integrationtests/lancelot/images/dome_mono_palette.png b/tests/auto/other/lancelot/images/dome_mono_palette.png
index dca3f59245..dca3f59245 100644
--- a/tests/auto/integrationtests/lancelot/images/dome_mono_palette.png
+++ b/tests/auto/other/lancelot/images/dome_mono_palette.png
Binary files differ
diff --git a/tests/auto/integrationtests/lancelot/images/dome_rgb32.png b/tests/auto/other/lancelot/images/dome_rgb32.png
index 27bc02a545..27bc02a545 100644
--- a/tests/auto/integrationtests/lancelot/images/dome_rgb32.png
+++ b/tests/auto/other/lancelot/images/dome_rgb32.png
Binary files differ
diff --git a/tests/auto/integrationtests/lancelot/images/dot.png b/tests/auto/other/lancelot/images/dot.png
index 17a7b6a0ba..17a7b6a0ba 100644
--- a/tests/auto/integrationtests/lancelot/images/dot.png
+++ b/tests/auto/other/lancelot/images/dot.png
Binary files differ
diff --git a/tests/auto/integrationtests/lancelot/images/face.png b/tests/auto/other/lancelot/images/face.png
index 4f6172d83b..4f6172d83b 100644
--- a/tests/auto/integrationtests/lancelot/images/face.png
+++ b/tests/auto/other/lancelot/images/face.png
Binary files differ
diff --git a/tests/auto/integrationtests/lancelot/images/gam030.png b/tests/auto/other/lancelot/images/gam030.png
index 904c9721bd..904c9721bd 100644
--- a/tests/auto/integrationtests/lancelot/images/gam030.png
+++ b/tests/auto/other/lancelot/images/gam030.png
Binary files differ
diff --git a/tests/auto/integrationtests/lancelot/images/gam045.png b/tests/auto/other/lancelot/images/gam045.png
index b649a8a54f..b649a8a54f 100644
--- a/tests/auto/integrationtests/lancelot/images/gam045.png
+++ b/tests/auto/other/lancelot/images/gam045.png
Binary files differ
diff --git a/tests/auto/integrationtests/lancelot/images/gam056.png b/tests/auto/other/lancelot/images/gam056.png
index e5f959dc96..e5f959dc96 100644
--- a/tests/auto/integrationtests/lancelot/images/gam056.png
+++ b/tests/auto/other/lancelot/images/gam056.png
Binary files differ
diff --git a/tests/auto/integrationtests/lancelot/images/gam100.png b/tests/auto/other/lancelot/images/gam100.png
index 6c7ba5f1ed..6c7ba5f1ed 100644
--- a/tests/auto/integrationtests/lancelot/images/gam100.png
+++ b/tests/auto/other/lancelot/images/gam100.png
Binary files differ
diff --git a/tests/auto/integrationtests/lancelot/images/gam200.png b/tests/auto/other/lancelot/images/gam200.png
index daa20fcbc4..daa20fcbc4 100644
--- a/tests/auto/integrationtests/lancelot/images/gam200.png
+++ b/tests/auto/other/lancelot/images/gam200.png
Binary files differ
diff --git a/tests/auto/integrationtests/lancelot/images/image.png b/tests/auto/other/lancelot/images/image.png
index 85d486a790..85d486a790 100644
--- a/tests/auto/integrationtests/lancelot/images/image.png
+++ b/tests/auto/other/lancelot/images/image.png
Binary files differ
diff --git a/tests/auto/integrationtests/lancelot/images/mask.png b/tests/auto/other/lancelot/images/mask.png
index c3f3b1b6ca..c3f3b1b6ca 100644
--- a/tests/auto/integrationtests/lancelot/images/mask.png
+++ b/tests/auto/other/lancelot/images/mask.png
Binary files differ
diff --git a/tests/auto/integrationtests/lancelot/images/mask_100.png b/tests/auto/other/lancelot/images/mask_100.png
index fc950dc7ed..fc950dc7ed 100644
--- a/tests/auto/integrationtests/lancelot/images/mask_100.png
+++ b/tests/auto/other/lancelot/images/mask_100.png
Binary files differ
diff --git a/tests/auto/integrationtests/lancelot/images/masked.png b/tests/auto/other/lancelot/images/masked.png
index 6debec534d..6debec534d 100644
--- a/tests/auto/integrationtests/lancelot/images/masked.png
+++ b/tests/auto/other/lancelot/images/masked.png
Binary files differ
diff --git a/tests/auto/integrationtests/lancelot/images/sign.png b/tests/auto/other/lancelot/images/sign.png
index 6aac7e150a..6aac7e150a 100644
--- a/tests/auto/integrationtests/lancelot/images/sign.png
+++ b/tests/auto/other/lancelot/images/sign.png
Binary files differ
diff --git a/tests/auto/integrationtests/lancelot/images/solid.png b/tests/auto/other/lancelot/images/solid.png
index 371e9c1aee..371e9c1aee 100644
--- a/tests/auto/integrationtests/lancelot/images/solid.png
+++ b/tests/auto/other/lancelot/images/solid.png
Binary files differ
diff --git a/tests/auto/integrationtests/lancelot/images/solid2x2.png b/tests/auto/other/lancelot/images/solid2x2.png
index ad67cd3e12..ad67cd3e12 100644
--- a/tests/auto/integrationtests/lancelot/images/solid2x2.png
+++ b/tests/auto/other/lancelot/images/solid2x2.png
Binary files differ
diff --git a/tests/auto/integrationtests/lancelot/images/struct-image-01.jpg b/tests/auto/other/lancelot/images/struct-image-01.jpg
index a74e07223b..a74e07223b 100644
--- a/tests/auto/integrationtests/lancelot/images/struct-image-01.jpg
+++ b/tests/auto/other/lancelot/images/struct-image-01.jpg
Binary files differ
diff --git a/tests/auto/integrationtests/lancelot/images/struct-image-01.png b/tests/auto/other/lancelot/images/struct-image-01.png
index 4ed08406dc..4ed08406dc 100644
--- a/tests/auto/integrationtests/lancelot/images/struct-image-01.png
+++ b/tests/auto/other/lancelot/images/struct-image-01.png
Binary files differ
diff --git a/tests/auto/integrationtests/lancelot/images/zebra.png b/tests/auto/other/lancelot/images/zebra.png
index ef35f20785..ef35f20785 100644
--- a/tests/auto/integrationtests/lancelot/images/zebra.png
+++ b/tests/auto/other/lancelot/images/zebra.png
Binary files differ
diff --git a/tests/auto/integrationtests/lancelot/lancelot.pro b/tests/auto/other/lancelot/lancelot.pro
index bbb48c745e..bbb48c745e 100644
--- a/tests/auto/integrationtests/lancelot/lancelot.pro
+++ b/tests/auto/other/lancelot/lancelot.pro
diff --git a/tests/auto/integrationtests/lancelot/paintcommands.cpp b/tests/auto/other/lancelot/paintcommands.cpp
index dc23575fc5..dc23575fc5 100644
--- a/tests/auto/integrationtests/lancelot/paintcommands.cpp
+++ b/tests/auto/other/lancelot/paintcommands.cpp
diff --git a/tests/auto/integrationtests/lancelot/paintcommands.h b/tests/auto/other/lancelot/paintcommands.h
index 925a867f2f..925a867f2f 100644
--- a/tests/auto/integrationtests/lancelot/paintcommands.h
+++ b/tests/auto/other/lancelot/paintcommands.h
diff --git a/tests/auto/integrationtests/lancelot/scripts/aliasing.qps b/tests/auto/other/lancelot/scripts/aliasing.qps
index 59878f9c4d..59878f9c4d 100644
--- a/tests/auto/integrationtests/lancelot/scripts/aliasing.qps
+++ b/tests/auto/other/lancelot/scripts/aliasing.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/arcs.qps b/tests/auto/other/lancelot/scripts/arcs.qps
index 8a7a468df1..8a7a468df1 100644
--- a/tests/auto/integrationtests/lancelot/scripts/arcs.qps
+++ b/tests/auto/other/lancelot/scripts/arcs.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/arcs2.qps b/tests/auto/other/lancelot/scripts/arcs2.qps
index 411ff08014..411ff08014 100644
--- a/tests/auto/integrationtests/lancelot/scripts/arcs2.qps
+++ b/tests/auto/other/lancelot/scripts/arcs2.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/background.qps b/tests/auto/other/lancelot/scripts/background.qps
index 000cfcdd91..000cfcdd91 100644
--- a/tests/auto/integrationtests/lancelot/scripts/background.qps
+++ b/tests/auto/other/lancelot/scripts/background.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/background_brush.qps b/tests/auto/other/lancelot/scripts/background_brush.qps
index ca1f944964..ca1f944964 100644
--- a/tests/auto/integrationtests/lancelot/scripts/background_brush.qps
+++ b/tests/auto/other/lancelot/scripts/background_brush.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/beziers.qps b/tests/auto/other/lancelot/scripts/beziers.qps
index 9b47cd05ac..9b47cd05ac 100644
--- a/tests/auto/integrationtests/lancelot/scripts/beziers.qps
+++ b/tests/auto/other/lancelot/scripts/beziers.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/bitmaps.qps b/tests/auto/other/lancelot/scripts/bitmaps.qps
index a816b9d497..a816b9d497 100644
--- a/tests/auto/integrationtests/lancelot/scripts/bitmaps.qps
+++ b/tests/auto/other/lancelot/scripts/bitmaps.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/borderimage.qps b/tests/auto/other/lancelot/scripts/borderimage.qps
index ebd4f4d249..ebd4f4d249 100644
--- a/tests/auto/integrationtests/lancelot/scripts/borderimage.qps
+++ b/tests/auto/other/lancelot/scripts/borderimage.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/brush_pens.qps b/tests/auto/other/lancelot/scripts/brush_pens.qps
index b9a2bc0ada..b9a2bc0ada 100644
--- a/tests/auto/integrationtests/lancelot/scripts/brush_pens.qps
+++ b/tests/auto/other/lancelot/scripts/brush_pens.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/brushes.qps b/tests/auto/other/lancelot/scripts/brushes.qps
index 82cbff48b9..82cbff48b9 100644
--- a/tests/auto/integrationtests/lancelot/scripts/brushes.qps
+++ b/tests/auto/other/lancelot/scripts/brushes.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/clippaths.qps b/tests/auto/other/lancelot/scripts/clippaths.qps
index fba89784df..fba89784df 100644
--- a/tests/auto/integrationtests/lancelot/scripts/clippaths.qps
+++ b/tests/auto/other/lancelot/scripts/clippaths.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/clipping.qps b/tests/auto/other/lancelot/scripts/clipping.qps
index 3694ff2ba7..3694ff2ba7 100644
--- a/tests/auto/integrationtests/lancelot/scripts/clipping.qps
+++ b/tests/auto/other/lancelot/scripts/clipping.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/clipping_state.qps b/tests/auto/other/lancelot/scripts/clipping_state.qps
index a29d3738c8..a29d3738c8 100644
--- a/tests/auto/integrationtests/lancelot/scripts/clipping_state.qps
+++ b/tests/auto/other/lancelot/scripts/clipping_state.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/cliprects.qps b/tests/auto/other/lancelot/scripts/cliprects.qps
index 0d28b035b4..0d28b035b4 100644
--- a/tests/auto/integrationtests/lancelot/scripts/cliprects.qps
+++ b/tests/auto/other/lancelot/scripts/cliprects.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/conical_gradients.qps b/tests/auto/other/lancelot/scripts/conical_gradients.qps
index 2e897b1813..2e897b1813 100644
--- a/tests/auto/integrationtests/lancelot/scripts/conical_gradients.qps
+++ b/tests/auto/other/lancelot/scripts/conical_gradients.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/conical_gradients_perspectives.qps b/tests/auto/other/lancelot/scripts/conical_gradients_perspectives.qps
index a9c14f1ce7..a9c14f1ce7 100644
--- a/tests/auto/integrationtests/lancelot/scripts/conical_gradients_perspectives.qps
+++ b/tests/auto/other/lancelot/scripts/conical_gradients_perspectives.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/dashes.qps b/tests/auto/other/lancelot/scripts/dashes.qps
index 649f56cf66..649f56cf66 100644
--- a/tests/auto/integrationtests/lancelot/scripts/dashes.qps
+++ b/tests/auto/other/lancelot/scripts/dashes.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/degeneratebeziers.qps b/tests/auto/other/lancelot/scripts/degeneratebeziers.qps
index fb223d5b1f..fb223d5b1f 100644
--- a/tests/auto/integrationtests/lancelot/scripts/degeneratebeziers.qps
+++ b/tests/auto/other/lancelot/scripts/degeneratebeziers.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/deviceclipping.qps b/tests/auto/other/lancelot/scripts/deviceclipping.qps
index cedfc1e363..cedfc1e363 100644
--- a/tests/auto/integrationtests/lancelot/scripts/deviceclipping.qps
+++ b/tests/auto/other/lancelot/scripts/deviceclipping.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/drawpoints.qps b/tests/auto/other/lancelot/scripts/drawpoints.qps
index c02cd85737..c02cd85737 100644
--- a/tests/auto/integrationtests/lancelot/scripts/drawpoints.qps
+++ b/tests/auto/other/lancelot/scripts/drawpoints.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/ellipses.qps b/tests/auto/other/lancelot/scripts/ellipses.qps
index e2cffd7f27..e2cffd7f27 100644
--- a/tests/auto/integrationtests/lancelot/scripts/ellipses.qps
+++ b/tests/auto/other/lancelot/scripts/ellipses.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/filltest.qps b/tests/auto/other/lancelot/scripts/filltest.qps
index 2eeba2ecf6..2eeba2ecf6 100644
--- a/tests/auto/integrationtests/lancelot/scripts/filltest.qps
+++ b/tests/auto/other/lancelot/scripts/filltest.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/gradients.qps b/tests/auto/other/lancelot/scripts/gradients.qps
index eb3cda9cad..eb3cda9cad 100644
--- a/tests/auto/integrationtests/lancelot/scripts/gradients.qps
+++ b/tests/auto/other/lancelot/scripts/gradients.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/hinting.qps b/tests/auto/other/lancelot/scripts/hinting.qps
index 7ce21b287a..7ce21b287a 100644
--- a/tests/auto/integrationtests/lancelot/scripts/hinting.qps
+++ b/tests/auto/other/lancelot/scripts/hinting.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/image_formats.qps b/tests/auto/other/lancelot/scripts/image_formats.qps
index d817d04bf8..d817d04bf8 100644
--- a/tests/auto/integrationtests/lancelot/scripts/image_formats.qps
+++ b/tests/auto/other/lancelot/scripts/image_formats.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/images.qps b/tests/auto/other/lancelot/scripts/images.qps
index 3f892400e2..3f892400e2 100644
--- a/tests/auto/integrationtests/lancelot/scripts/images.qps
+++ b/tests/auto/other/lancelot/scripts/images.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/images2.qps b/tests/auto/other/lancelot/scripts/images2.qps
index 5159abc928..5159abc928 100644
--- a/tests/auto/integrationtests/lancelot/scripts/images2.qps
+++ b/tests/auto/other/lancelot/scripts/images2.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/join_cap_styles.qps b/tests/auto/other/lancelot/scripts/join_cap_styles.qps
index ed823f53f5..ed823f53f5 100644
--- a/tests/auto/integrationtests/lancelot/scripts/join_cap_styles.qps
+++ b/tests/auto/other/lancelot/scripts/join_cap_styles.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/join_cap_styles_duplicate_control_points.qps b/tests/auto/other/lancelot/scripts/join_cap_styles_duplicate_control_points.qps
index b4630148e2..b4630148e2 100644
--- a/tests/auto/integrationtests/lancelot/scripts/join_cap_styles_duplicate_control_points.qps
+++ b/tests/auto/other/lancelot/scripts/join_cap_styles_duplicate_control_points.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/linear_gradients.qps b/tests/auto/other/lancelot/scripts/linear_gradients.qps
index b1b8dd69e7..b1b8dd69e7 100644
--- a/tests/auto/integrationtests/lancelot/scripts/linear_gradients.qps
+++ b/tests/auto/other/lancelot/scripts/linear_gradients.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/linear_gradients_perspectives.qps b/tests/auto/other/lancelot/scripts/linear_gradients_perspectives.qps
index 3ea39fbe46..3ea39fbe46 100644
--- a/tests/auto/integrationtests/lancelot/scripts/linear_gradients_perspectives.qps
+++ b/tests/auto/other/lancelot/scripts/linear_gradients_perspectives.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/linear_resolving_gradients.qps b/tests/auto/other/lancelot/scripts/linear_resolving_gradients.qps
index 779760cb9a..779760cb9a 100644
--- a/tests/auto/integrationtests/lancelot/scripts/linear_resolving_gradients.qps
+++ b/tests/auto/other/lancelot/scripts/linear_resolving_gradients.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/lineconsistency.qps b/tests/auto/other/lancelot/scripts/lineconsistency.qps
index 0b40577659..0b40577659 100644
--- a/tests/auto/integrationtests/lancelot/scripts/lineconsistency.qps
+++ b/tests/auto/other/lancelot/scripts/lineconsistency.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/linedashes.qps b/tests/auto/other/lancelot/scripts/linedashes.qps
index ee7d18b156..ee7d18b156 100644
--- a/tests/auto/integrationtests/lancelot/scripts/linedashes.qps
+++ b/tests/auto/other/lancelot/scripts/linedashes.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/linedashes2.qps b/tests/auto/other/lancelot/scripts/linedashes2.qps
index 1dc4fd310e..1dc4fd310e 100644
--- a/tests/auto/integrationtests/lancelot/scripts/linedashes2.qps
+++ b/tests/auto/other/lancelot/scripts/linedashes2.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/linedashes2_aa.qps b/tests/auto/other/lancelot/scripts/linedashes2_aa.qps
index c818ab62fe..c818ab62fe 100644
--- a/tests/auto/integrationtests/lancelot/scripts/linedashes2_aa.qps
+++ b/tests/auto/other/lancelot/scripts/linedashes2_aa.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/lines.qps b/tests/auto/other/lancelot/scripts/lines.qps
index c0daffb1b0..c0daffb1b0 100644
--- a/tests/auto/integrationtests/lancelot/scripts/lines.qps
+++ b/tests/auto/other/lancelot/scripts/lines.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/lines2.qps b/tests/auto/other/lancelot/scripts/lines2.qps
index af6ad65939..af6ad65939 100644
--- a/tests/auto/integrationtests/lancelot/scripts/lines2.qps
+++ b/tests/auto/other/lancelot/scripts/lines2.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/pathfill.qps b/tests/auto/other/lancelot/scripts/pathfill.qps
index 821b4684c9..821b4684c9 100644
--- a/tests/auto/integrationtests/lancelot/scripts/pathfill.qps
+++ b/tests/auto/other/lancelot/scripts/pathfill.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/paths.qps b/tests/auto/other/lancelot/scripts/paths.qps
index 083026ee17..083026ee17 100644
--- a/tests/auto/integrationtests/lancelot/scripts/paths.qps
+++ b/tests/auto/other/lancelot/scripts/paths.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/paths_aa.qps b/tests/auto/other/lancelot/scripts/paths_aa.qps
index 4812e2fa5f..4812e2fa5f 100644
--- a/tests/auto/integrationtests/lancelot/scripts/paths_aa.qps
+++ b/tests/auto/other/lancelot/scripts/paths_aa.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/pens.qps b/tests/auto/other/lancelot/scripts/pens.qps
index c72636dcef..c72636dcef 100644
--- a/tests/auto/integrationtests/lancelot/scripts/pens.qps
+++ b/tests/auto/other/lancelot/scripts/pens.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/pens_aa.qps b/tests/auto/other/lancelot/scripts/pens_aa.qps
index 066cac365f..066cac365f 100644
--- a/tests/auto/integrationtests/lancelot/scripts/pens_aa.qps
+++ b/tests/auto/other/lancelot/scripts/pens_aa.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/pens_cosmetic.qps b/tests/auto/other/lancelot/scripts/pens_cosmetic.qps
index d1a60d150d..d1a60d150d 100644
--- a/tests/auto/integrationtests/lancelot/scripts/pens_cosmetic.qps
+++ b/tests/auto/other/lancelot/scripts/pens_cosmetic.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/perspectives.qps b/tests/auto/other/lancelot/scripts/perspectives.qps
index 0b903e5260..0b903e5260 100644
--- a/tests/auto/integrationtests/lancelot/scripts/perspectives.qps
+++ b/tests/auto/other/lancelot/scripts/perspectives.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/perspectives2.qps b/tests/auto/other/lancelot/scripts/perspectives2.qps
index 2f6d1d653c..2f6d1d653c 100644
--- a/tests/auto/integrationtests/lancelot/scripts/perspectives2.qps
+++ b/tests/auto/other/lancelot/scripts/perspectives2.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/pixmap_rotation.qps b/tests/auto/other/lancelot/scripts/pixmap_rotation.qps
index 2f1ffb53e6..2f1ffb53e6 100644
--- a/tests/auto/integrationtests/lancelot/scripts/pixmap_rotation.qps
+++ b/tests/auto/other/lancelot/scripts/pixmap_rotation.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/pixmap_scaling.qps b/tests/auto/other/lancelot/scripts/pixmap_scaling.qps
index 651896f4a3..651896f4a3 100644
--- a/tests/auto/integrationtests/lancelot/scripts/pixmap_scaling.qps
+++ b/tests/auto/other/lancelot/scripts/pixmap_scaling.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/pixmap_subpixel.qps b/tests/auto/other/lancelot/scripts/pixmap_subpixel.qps
index 908f7c3465..908f7c3465 100644
--- a/tests/auto/integrationtests/lancelot/scripts/pixmap_subpixel.qps
+++ b/tests/auto/other/lancelot/scripts/pixmap_subpixel.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/pixmaps.qps b/tests/auto/other/lancelot/scripts/pixmaps.qps
index 8e60997acc..8e60997acc 100644
--- a/tests/auto/integrationtests/lancelot/scripts/pixmaps.qps
+++ b/tests/auto/other/lancelot/scripts/pixmaps.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/porter_duff.qps b/tests/auto/other/lancelot/scripts/porter_duff.qps
index 166e48a57f..166e48a57f 100644
--- a/tests/auto/integrationtests/lancelot/scripts/porter_duff.qps
+++ b/tests/auto/other/lancelot/scripts/porter_duff.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/porter_duff2.qps b/tests/auto/other/lancelot/scripts/porter_duff2.qps
index a792d9b278..a792d9b278 100644
--- a/tests/auto/integrationtests/lancelot/scripts/porter_duff2.qps
+++ b/tests/auto/other/lancelot/scripts/porter_duff2.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/primitives.qps b/tests/auto/other/lancelot/scripts/primitives.qps
index f44ba27566..f44ba27566 100644
--- a/tests/auto/integrationtests/lancelot/scripts/primitives.qps
+++ b/tests/auto/other/lancelot/scripts/primitives.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/radial_gradients.qps b/tests/auto/other/lancelot/scripts/radial_gradients.qps
index b55df8bde6..b55df8bde6 100644
--- a/tests/auto/integrationtests/lancelot/scripts/radial_gradients.qps
+++ b/tests/auto/other/lancelot/scripts/radial_gradients.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/radial_gradients_perspectives.qps b/tests/auto/other/lancelot/scripts/radial_gradients_perspectives.qps
index 4557354dce..4557354dce 100644
--- a/tests/auto/integrationtests/lancelot/scripts/radial_gradients_perspectives.qps
+++ b/tests/auto/other/lancelot/scripts/radial_gradients_perspectives.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/rasterops.qps b/tests/auto/other/lancelot/scripts/rasterops.qps
index 21f943b543..21f943b543 100644
--- a/tests/auto/integrationtests/lancelot/scripts/rasterops.qps
+++ b/tests/auto/other/lancelot/scripts/rasterops.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/sizes.qps b/tests/auto/other/lancelot/scripts/sizes.qps
index 68e01c3262..68e01c3262 100644
--- a/tests/auto/integrationtests/lancelot/scripts/sizes.qps
+++ b/tests/auto/other/lancelot/scripts/sizes.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/statictext.qps b/tests/auto/other/lancelot/scripts/statictext.qps
index b62b623462..b62b623462 100644
--- a/tests/auto/integrationtests/lancelot/scripts/statictext.qps
+++ b/tests/auto/other/lancelot/scripts/statictext.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/text.qps b/tests/auto/other/lancelot/scripts/text.qps
index d7ee83290b..d7ee83290b 100644
--- a/tests/auto/integrationtests/lancelot/scripts/text.qps
+++ b/tests/auto/other/lancelot/scripts/text.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/text_perspectives.qps b/tests/auto/other/lancelot/scripts/text_perspectives.qps
index 4c74306265..4c74306265 100644
--- a/tests/auto/integrationtests/lancelot/scripts/text_perspectives.qps
+++ b/tests/auto/other/lancelot/scripts/text_perspectives.qps
diff --git a/tests/auto/integrationtests/lancelot/scripts/tiled_pixmap.qps b/tests/auto/other/lancelot/scripts/tiled_pixmap.qps
index 9cb5e0dd1f..9cb5e0dd1f 100644
--- a/tests/auto/integrationtests/lancelot/scripts/tiled_pixmap.qps
+++ b/tests/auto/other/lancelot/scripts/tiled_pixmap.qps
diff --git a/tests/auto/integrationtests/lancelot/tst_lancelot.cpp b/tests/auto/other/lancelot/tst_lancelot.cpp
index cbbd28dc82..cbbd28dc82 100644
--- a/tests/auto/integrationtests/lancelot/tst_lancelot.cpp
+++ b/tests/auto/other/lancelot/tst_lancelot.cpp
diff --git a/tests/auto/integrationtests/languagechange/.gitignore b/tests/auto/other/languagechange/.gitignore
index 1b14ad1503..1b14ad1503 100644
--- a/tests/auto/integrationtests/languagechange/.gitignore
+++ b/tests/auto/other/languagechange/.gitignore
diff --git a/tests/auto/integrationtests/languagechange/languagechange.pro b/tests/auto/other/languagechange/languagechange.pro
index 541a2f05fd..541a2f05fd 100644
--- a/tests/auto/integrationtests/languagechange/languagechange.pro
+++ b/tests/auto/other/languagechange/languagechange.pro
diff --git a/tests/auto/integrationtests/languagechange/tst_languagechange.cpp b/tests/auto/other/languagechange/tst_languagechange.cpp
index 5373431d27..5373431d27 100644
--- a/tests/auto/integrationtests/languagechange/tst_languagechange.cpp
+++ b/tests/auto/other/languagechange/tst_languagechange.cpp
diff --git a/tests/auto/integrationtests/macgui/.gitignore b/tests/auto/other/macgui/.gitignore
index 2b13357fac..2b13357fac 100644
--- a/tests/auto/integrationtests/macgui/.gitignore
+++ b/tests/auto/other/macgui/.gitignore
diff --git a/tests/auto/integrationtests/macgui/guitest.cpp b/tests/auto/other/macgui/guitest.cpp
index e5245528cb..e5245528cb 100644
--- a/tests/auto/integrationtests/macgui/guitest.cpp
+++ b/tests/auto/other/macgui/guitest.cpp
diff --git a/tests/auto/integrationtests/macgui/guitest.h b/tests/auto/other/macgui/guitest.h
index 170fc5c19c..170fc5c19c 100644
--- a/tests/auto/integrationtests/macgui/guitest.h
+++ b/tests/auto/other/macgui/guitest.h
diff --git a/tests/auto/integrationtests/macgui/macgui.pro b/tests/auto/other/macgui/macgui.pro
index 5632450a3a..5632450a3a 100644
--- a/tests/auto/integrationtests/macgui/macgui.pro
+++ b/tests/auto/other/macgui/macgui.pro
diff --git a/tests/auto/integrationtests/macgui/tst_macgui.cpp b/tests/auto/other/macgui/tst_macgui.cpp
index 9ff2897aa8..9ff2897aa8 100644
--- a/tests/auto/integrationtests/macgui/tst_macgui.cpp
+++ b/tests/auto/other/macgui/tst_macgui.cpp
diff --git a/tests/auto/integrationtests/macnativeevents/expectedeventlist.cpp b/tests/auto/other/macnativeevents/expectedeventlist.cpp
index d603f82f27..d603f82f27 100644
--- a/tests/auto/integrationtests/macnativeevents/expectedeventlist.cpp
+++ b/tests/auto/other/macnativeevents/expectedeventlist.cpp
diff --git a/tests/auto/integrationtests/macnativeevents/expectedeventlist.h b/tests/auto/other/macnativeevents/expectedeventlist.h
index e3fef2d56d..e3fef2d56d 100644
--- a/tests/auto/integrationtests/macnativeevents/expectedeventlist.h
+++ b/tests/auto/other/macnativeevents/expectedeventlist.h
diff --git a/tests/auto/integrationtests/macnativeevents/macnativeevents.pro b/tests/auto/other/macnativeevents/macnativeevents.pro
index efe091f9f0..efe091f9f0 100644
--- a/tests/auto/integrationtests/macnativeevents/macnativeevents.pro
+++ b/tests/auto/other/macnativeevents/macnativeevents.pro
diff --git a/tests/auto/integrationtests/macnativeevents/nativeeventlist.cpp b/tests/auto/other/macnativeevents/nativeeventlist.cpp
index 8c7f609d9f..8c7f609d9f 100644
--- a/tests/auto/integrationtests/macnativeevents/nativeeventlist.cpp
+++ b/tests/auto/other/macnativeevents/nativeeventlist.cpp
diff --git a/tests/auto/integrationtests/macnativeevents/nativeeventlist.h b/tests/auto/other/macnativeevents/nativeeventlist.h
index 6bebca1613..6bebca1613 100644
--- a/tests/auto/integrationtests/macnativeevents/nativeeventlist.h
+++ b/tests/auto/other/macnativeevents/nativeeventlist.h
diff --git a/tests/auto/integrationtests/macnativeevents/qnativeevents.cpp b/tests/auto/other/macnativeevents/qnativeevents.cpp
index b530d7bbe3..b530d7bbe3 100644
--- a/tests/auto/integrationtests/macnativeevents/qnativeevents.cpp
+++ b/tests/auto/other/macnativeevents/qnativeevents.cpp
diff --git a/tests/auto/integrationtests/macnativeevents/qnativeevents.h b/tests/auto/other/macnativeevents/qnativeevents.h
index d303a55397..d303a55397 100644
--- a/tests/auto/integrationtests/macnativeevents/qnativeevents.h
+++ b/tests/auto/other/macnativeevents/qnativeevents.h
diff --git a/tests/auto/integrationtests/macnativeevents/qnativeevents_mac.cpp b/tests/auto/other/macnativeevents/qnativeevents_mac.cpp
index 8987a8d502..8987a8d502 100644
--- a/tests/auto/integrationtests/macnativeevents/qnativeevents_mac.cpp
+++ b/tests/auto/other/macnativeevents/qnativeevents_mac.cpp
diff --git a/tests/auto/integrationtests/macnativeevents/tst_macnativeevents.cpp b/tests/auto/other/macnativeevents/tst_macnativeevents.cpp
index ea30b0b5c2..ea30b0b5c2 100644
--- a/tests/auto/integrationtests/macnativeevents/tst_macnativeevents.cpp
+++ b/tests/auto/other/macnativeevents/tst_macnativeevents.cpp
diff --git a/tests/auto/integrationtests/macplist/app/app.pro b/tests/auto/other/macplist/app/app.pro
index b4b895197c..b4b895197c 100644
--- a/tests/auto/integrationtests/macplist/app/app.pro
+++ b/tests/auto/other/macplist/app/app.pro
diff --git a/tests/auto/integrationtests/macplist/app/main.cpp b/tests/auto/other/macplist/app/main.cpp
index 90bf60ae38..90bf60ae38 100644
--- a/tests/auto/integrationtests/macplist/app/main.cpp
+++ b/tests/auto/other/macplist/app/main.cpp
diff --git a/tests/auto/integrationtests/macplist/macplist.pro b/tests/auto/other/macplist/macplist.pro
index 3a0e2d43d3..3a0e2d43d3 100644
--- a/tests/auto/integrationtests/macplist/macplist.pro
+++ b/tests/auto/other/macplist/macplist.pro
diff --git a/tests/auto/integrationtests/macplist/test/test.pro b/tests/auto/other/macplist/test/test.pro
index 5018abeca9..5018abeca9 100644
--- a/tests/auto/integrationtests/macplist/test/test.pro
+++ b/tests/auto/other/macplist/test/test.pro
diff --git a/tests/auto/integrationtests/macplist/tst_macplist.cpp b/tests/auto/other/macplist/tst_macplist.cpp
index 5b48c586b5..5b48c586b5 100644
--- a/tests/auto/integrationtests/macplist/tst_macplist.cpp
+++ b/tests/auto/other/macplist/tst_macplist.cpp
diff --git a/tests/auto/integrationtests/modeltest/dynamictreemodel.cpp b/tests/auto/other/modeltest/dynamictreemodel.cpp
index 5ab37ab112..5ab37ab112 100644
--- a/tests/auto/integrationtests/modeltest/dynamictreemodel.cpp
+++ b/tests/auto/other/modeltest/dynamictreemodel.cpp
diff --git a/tests/auto/integrationtests/modeltest/dynamictreemodel.h b/tests/auto/other/modeltest/dynamictreemodel.h
index 6f52d78588..6f52d78588 100644
--- a/tests/auto/integrationtests/modeltest/dynamictreemodel.h
+++ b/tests/auto/other/modeltest/dynamictreemodel.h
diff --git a/tests/auto/integrationtests/modeltest/modeltest.cpp b/tests/auto/other/modeltest/modeltest.cpp
index 76803dfbe5..76803dfbe5 100644
--- a/tests/auto/integrationtests/modeltest/modeltest.cpp
+++ b/tests/auto/other/modeltest/modeltest.cpp
diff --git a/tests/auto/integrationtests/modeltest/modeltest.h b/tests/auto/other/modeltest/modeltest.h
index e4ef478c5e..e4ef478c5e 100644
--- a/tests/auto/integrationtests/modeltest/modeltest.h
+++ b/tests/auto/other/modeltest/modeltest.h
diff --git a/tests/auto/integrationtests/modeltest/modeltest.pro b/tests/auto/other/modeltest/modeltest.pro
index b29fb862c7..b29fb862c7 100644
--- a/tests/auto/integrationtests/modeltest/modeltest.pro
+++ b/tests/auto/other/modeltest/modeltest.pro
diff --git a/tests/auto/integrationtests/modeltest/tst_modeltest.cpp b/tests/auto/other/modeltest/tst_modeltest.cpp
index 434537a81f..434537a81f 100644
--- a/tests/auto/integrationtests/modeltest/tst_modeltest.cpp
+++ b/tests/auto/other/modeltest/tst_modeltest.cpp
diff --git a/tests/auto/integrationtests/networkselftest/networkselftest.pro b/tests/auto/other/networkselftest/networkselftest.pro
index 3cd5f26689..3cd5f26689 100644
--- a/tests/auto/integrationtests/networkselftest/networkselftest.pro
+++ b/tests/auto/other/networkselftest/networkselftest.pro
diff --git a/tests/auto/integrationtests/networkselftest/rfc3252.txt b/tests/auto/other/networkselftest/rfc3252.txt
index b80c61bf0a..b80c61bf0a 100644
--- a/tests/auto/integrationtests/networkselftest/rfc3252.txt
+++ b/tests/auto/other/networkselftest/rfc3252.txt
diff --git a/tests/auto/integrationtests/networkselftest/tst_networkselftest.cpp b/tests/auto/other/networkselftest/tst_networkselftest.cpp
index c768a29bf8..c768a29bf8 100644
--- a/tests/auto/integrationtests/networkselftest/tst_networkselftest.cpp
+++ b/tests/auto/other/networkselftest/tst_networkselftest.cpp
diff --git a/tests/auto/other/other.pro b/tests/auto/other/other.pro
index fe36713117..f0c9b11493 100644
--- a/tests/auto/other/other.pro
+++ b/tests/auto/other/other.pro
@@ -2,12 +2,47 @@ TEMPLATE=subdirs
SUBDIRS=\
# atwrapper \ # QTBUG-19452
baselineexample \
+ collections \
compiler \
+ exceptionsafety \
+ exceptionsafety_objects \
+ gestures \
headersclean \
+ lancelot \
+ languagechange \
+ macgui \
+ macnativeevents \
+ macplist \
+ modeltest \
+ networkselftest \
+ qaccessibility \
+ qcomplextext \
+ qdirectpainter \
+ qfocusevent \
+ qmultiscreen \
+ qnetworkaccessmanager_and_qprogressdialog \
qobjectperformance \
+ qobjectrace \
+ qsharedpointer_and_qwidget \
qtokenautomaton \
+ windowsmobile \
cross_compile: SUBDIRS -= \
atwrapper \
compiler \
headersclean \
+
+wince*|!contains(QT_CONFIG, accessibility):SUBDIRS -= qaccessibility
+
+!mac: SUBDIRS -= \
+ macgui \
+ macnativeevents \
+ macplist
+
+!embedded|wince*: SUBDIRS -= \
+ qdirectpainter \
+ qmultiscreen \
+
+!linux*-g++*:SUBDIRS -= exceptionsafety_objects
+
+mac: lancelot.CONFIG = no_check_target # QTBUG-22792
diff --git a/tests/auto/integrationtests/qaccessibility/.gitignore b/tests/auto/other/qaccessibility/.gitignore
index 6fd6ae2d48..6fd6ae2d48 100644
--- a/tests/auto/integrationtests/qaccessibility/.gitignore
+++ b/tests/auto/other/qaccessibility/.gitignore
diff --git a/tests/auto/integrationtests/qaccessibility/qaccessibility.pro b/tests/auto/other/qaccessibility/qaccessibility.pro
index 0019cc94c8..0019cc94c8 100644
--- a/tests/auto/integrationtests/qaccessibility/qaccessibility.pro
+++ b/tests/auto/other/qaccessibility/qaccessibility.pro
diff --git a/tests/auto/integrationtests/qaccessibility/tst_qaccessibility.cpp b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
index 93a8dbe219..93a8dbe219 100644
--- a/tests/auto/integrationtests/qaccessibility/tst_qaccessibility.cpp
+++ b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
diff --git a/tests/auto/integrationtests/qcomplextext/.gitignore b/tests/auto/other/qcomplextext/.gitignore
index 8929cd2f89..8929cd2f89 100644
--- a/tests/auto/integrationtests/qcomplextext/.gitignore
+++ b/tests/auto/other/qcomplextext/.gitignore
diff --git a/tests/auto/integrationtests/qcomplextext/bidireorderstring.h b/tests/auto/other/qcomplextext/bidireorderstring.h
index e0bbf6e80b..e0bbf6e80b 100644
--- a/tests/auto/integrationtests/qcomplextext/bidireorderstring.h
+++ b/tests/auto/other/qcomplextext/bidireorderstring.h
diff --git a/tests/auto/integrationtests/qcomplextext/qcomplextext.pro b/tests/auto/other/qcomplextext/qcomplextext.pro
index ccea018c64..ccea018c64 100644
--- a/tests/auto/integrationtests/qcomplextext/qcomplextext.pro
+++ b/tests/auto/other/qcomplextext/qcomplextext.pro
diff --git a/tests/auto/integrationtests/qcomplextext/tst_qcomplextext.cpp b/tests/auto/other/qcomplextext/tst_qcomplextext.cpp
index c72393cfe6..c72393cfe6 100644
--- a/tests/auto/integrationtests/qcomplextext/tst_qcomplextext.cpp
+++ b/tests/auto/other/qcomplextext/tst_qcomplextext.cpp
diff --git a/tests/auto/integrationtests/qdirectpainter/.gitignore b/tests/auto/other/qdirectpainter/.gitignore
index 615dfa8ddc..615dfa8ddc 100644
--- a/tests/auto/integrationtests/qdirectpainter/.gitignore
+++ b/tests/auto/other/qdirectpainter/.gitignore
diff --git a/tests/auto/integrationtests/qdirectpainter/qdirectpainter.pro b/tests/auto/other/qdirectpainter/qdirectpainter.pro
index e86b3427eb..e86b3427eb 100644
--- a/tests/auto/integrationtests/qdirectpainter/qdirectpainter.pro
+++ b/tests/auto/other/qdirectpainter/qdirectpainter.pro
diff --git a/tests/auto/integrationtests/qdirectpainter/runDirectPainter/main.cpp b/tests/auto/other/qdirectpainter/runDirectPainter/main.cpp
index af3dd90beb..af3dd90beb 100644
--- a/tests/auto/integrationtests/qdirectpainter/runDirectPainter/main.cpp
+++ b/tests/auto/other/qdirectpainter/runDirectPainter/main.cpp
diff --git a/tests/auto/integrationtests/qdirectpainter/runDirectPainter/runDirectPainter.pro b/tests/auto/other/qdirectpainter/runDirectPainter/runDirectPainter.pro
index 5b70dc6b7b..5b70dc6b7b 100644
--- a/tests/auto/integrationtests/qdirectpainter/runDirectPainter/runDirectPainter.pro
+++ b/tests/auto/other/qdirectpainter/runDirectPainter/runDirectPainter.pro
diff --git a/tests/auto/integrationtests/qdirectpainter/test/test.pro b/tests/auto/other/qdirectpainter/test/test.pro
index 1f6813670d..1f6813670d 100644
--- a/tests/auto/integrationtests/qdirectpainter/test/test.pro
+++ b/tests/auto/other/qdirectpainter/test/test.pro
diff --git a/tests/auto/integrationtests/qdirectpainter/tst_qdirectpainter.cpp b/tests/auto/other/qdirectpainter/tst_qdirectpainter.cpp
index 550c2e96c0..550c2e96c0 100644
--- a/tests/auto/integrationtests/qdirectpainter/tst_qdirectpainter.cpp
+++ b/tests/auto/other/qdirectpainter/tst_qdirectpainter.cpp
diff --git a/tests/auto/integrationtests/qfocusevent/.gitignore b/tests/auto/other/qfocusevent/.gitignore
index f189d8aeb9..f189d8aeb9 100644
--- a/tests/auto/integrationtests/qfocusevent/.gitignore
+++ b/tests/auto/other/qfocusevent/.gitignore
diff --git a/tests/auto/integrationtests/qfocusevent/qfocusevent.pro b/tests/auto/other/qfocusevent/qfocusevent.pro
index ee2cf22a6a..ee2cf22a6a 100644
--- a/tests/auto/integrationtests/qfocusevent/qfocusevent.pro
+++ b/tests/auto/other/qfocusevent/qfocusevent.pro
diff --git a/tests/auto/integrationtests/qfocusevent/tst_qfocusevent.cpp b/tests/auto/other/qfocusevent/tst_qfocusevent.cpp
index cc58b6212c..cc58b6212c 100644
--- a/tests/auto/integrationtests/qfocusevent/tst_qfocusevent.cpp
+++ b/tests/auto/other/qfocusevent/tst_qfocusevent.cpp
diff --git a/tests/auto/integrationtests/qmultiscreen/.gitignore b/tests/auto/other/qmultiscreen/.gitignore
index 82e8d449ad..82e8d449ad 100644
--- a/tests/auto/integrationtests/qmultiscreen/.gitignore
+++ b/tests/auto/other/qmultiscreen/.gitignore
diff --git a/tests/auto/integrationtests/qmultiscreen/qmultiscreen.pro b/tests/auto/other/qmultiscreen/qmultiscreen.pro
index 28373823bf..28373823bf 100644
--- a/tests/auto/integrationtests/qmultiscreen/qmultiscreen.pro
+++ b/tests/auto/other/qmultiscreen/qmultiscreen.pro
diff --git a/tests/auto/integrationtests/qmultiscreen/tst_qmultiscreen.cpp b/tests/auto/other/qmultiscreen/tst_qmultiscreen.cpp
index 9d74d59f85..9d74d59f85 100644
--- a/tests/auto/integrationtests/qmultiscreen/tst_qmultiscreen.cpp
+++ b/tests/auto/other/qmultiscreen/tst_qmultiscreen.cpp
diff --git a/tests/auto/integrationtests/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro b/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro
index b03a448dfb..b03a448dfb 100644
--- a/tests/auto/integrationtests/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro
+++ b/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro
diff --git a/tests/auto/integrationtests/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp b/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp
index 63506fed1d..63506fed1d 100644
--- a/tests/auto/integrationtests/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp
+++ b/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp
diff --git a/tests/auto/integrationtests/qobjectrace/.gitignore b/tests/auto/other/qobjectrace/.gitignore
index 9d3f96e0a0..9d3f96e0a0 100644
--- a/tests/auto/integrationtests/qobjectrace/.gitignore
+++ b/tests/auto/other/qobjectrace/.gitignore
diff --git a/tests/auto/integrationtests/qobjectrace/qobjectrace.pro b/tests/auto/other/qobjectrace/qobjectrace.pro
index 9a0d8e58c4..9a0d8e58c4 100644
--- a/tests/auto/integrationtests/qobjectrace/qobjectrace.pro
+++ b/tests/auto/other/qobjectrace/qobjectrace.pro
diff --git a/tests/auto/integrationtests/qobjectrace/tst_qobjectrace.cpp b/tests/auto/other/qobjectrace/tst_qobjectrace.cpp
index 8cb7845e78..8cb7845e78 100644
--- a/tests/auto/integrationtests/qobjectrace/tst_qobjectrace.cpp
+++ b/tests/auto/other/qobjectrace/tst_qobjectrace.cpp
diff --git a/tests/auto/integrationtests/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro b/tests/auto/other/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro
index 722f575f80..722f575f80 100644
--- a/tests/auto/integrationtests/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro
+++ b/tests/auto/other/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro
diff --git a/tests/auto/integrationtests/qsharedpointer_and_qwidget/tst_qsharedpointer_and_qwidget.cpp b/tests/auto/other/qsharedpointer_and_qwidget/tst_qsharedpointer_and_qwidget.cpp
index 90b71c517c..90b71c517c 100644
--- a/tests/auto/integrationtests/qsharedpointer_and_qwidget/tst_qsharedpointer_and_qwidget.cpp
+++ b/tests/auto/other/qsharedpointer_and_qwidget/tst_qsharedpointer_and_qwidget.cpp
diff --git a/tests/auto/integrationtests/windowsmobile/test/ddhelper.cpp b/tests/auto/other/windowsmobile/test/ddhelper.cpp
index 55469f5901..55469f5901 100644
--- a/tests/auto/integrationtests/windowsmobile/test/ddhelper.cpp
+++ b/tests/auto/other/windowsmobile/test/ddhelper.cpp
diff --git a/tests/auto/integrationtests/windowsmobile/test/ddhelper.h b/tests/auto/other/windowsmobile/test/ddhelper.h
index 3d2f06aa36..3d2f06aa36 100644
--- a/tests/auto/integrationtests/windowsmobile/test/ddhelper.h
+++ b/tests/auto/other/windowsmobile/test/ddhelper.h
diff --git a/tests/auto/integrationtests/windowsmobile/test/test.pro b/tests/auto/other/windowsmobile/test/test.pro
index 36dd15f60e..36dd15f60e 100644
--- a/tests/auto/integrationtests/windowsmobile/test/test.pro
+++ b/tests/auto/other/windowsmobile/test/test.pro
diff --git a/tests/auto/integrationtests/windowsmobile/test/testQMenuBar_current.png b/tests/auto/other/windowsmobile/test/testQMenuBar_current.png
index f0042b8fe0..f0042b8fe0 100644
--- a/tests/auto/integrationtests/windowsmobile/test/testQMenuBar_current.png
+++ b/tests/auto/other/windowsmobile/test/testQMenuBar_current.png
Binary files differ
diff --git a/tests/auto/integrationtests/windowsmobile/test/testSimpleWidget_current.png b/tests/auto/other/windowsmobile/test/testSimpleWidget_current.png
index 8086c41ce9..8086c41ce9 100644
--- a/tests/auto/integrationtests/windowsmobile/test/testSimpleWidget_current.png
+++ b/tests/auto/other/windowsmobile/test/testSimpleWidget_current.png
Binary files differ
diff --git a/tests/auto/integrationtests/windowsmobile/test/tst_windowsmobile.cpp b/tests/auto/other/windowsmobile/test/tst_windowsmobile.cpp
index 4318de7991..4318de7991 100644
--- a/tests/auto/integrationtests/windowsmobile/test/tst_windowsmobile.cpp
+++ b/tests/auto/other/windowsmobile/test/tst_windowsmobile.cpp
diff --git a/tests/auto/integrationtests/windowsmobile/test/windowsmobile.qrc b/tests/auto/other/windowsmobile/test/windowsmobile.qrc
index 5d6f61459e..5d6f61459e 100644
--- a/tests/auto/integrationtests/windowsmobile/test/windowsmobile.qrc
+++ b/tests/auto/other/windowsmobile/test/windowsmobile.qrc
diff --git a/tests/auto/integrationtests/windowsmobile/testQMenuBar/main.cpp b/tests/auto/other/windowsmobile/testQMenuBar/main.cpp
index c2099a648b..c2099a648b 100644
--- a/tests/auto/integrationtests/windowsmobile/testQMenuBar/main.cpp
+++ b/tests/auto/other/windowsmobile/testQMenuBar/main.cpp
diff --git a/tests/auto/integrationtests/windowsmobile/testQMenuBar/testQMenuBar.pro b/tests/auto/other/windowsmobile/testQMenuBar/testQMenuBar.pro
index 6b84ae937c..6b84ae937c 100644
--- a/tests/auto/integrationtests/windowsmobile/testQMenuBar/testQMenuBar.pro
+++ b/tests/auto/other/windowsmobile/testQMenuBar/testQMenuBar.pro
diff --git a/tests/auto/integrationtests/windowsmobile/windowsmobile.pro b/tests/auto/other/windowsmobile/windowsmobile.pro
index 2e6b444d7b..2e6b444d7b 100644
--- a/tests/auto/integrationtests/windowsmobile/windowsmobile.pro
+++ b/tests/auto/other/windowsmobile/windowsmobile.pro
diff --git a/tests/auto/widgets/itemviews/qidentityproxymodel/qidentityproxymodel.pro b/tests/auto/widgets/itemviews/qidentityproxymodel/qidentityproxymodel.pro
index 52702f3990..4fb8c98fe7 100644
--- a/tests/auto/widgets/itemviews/qidentityproxymodel/qidentityproxymodel.pro
+++ b/tests/auto/widgets/itemviews/qidentityproxymodel/qidentityproxymodel.pro
@@ -1,7 +1,7 @@
CONFIG += testcase
TARGET = tst_qidentityproxymodel
-mtdir = ../../../integrationtests/modeltest
+mtdir = ../../../other/modeltest
INCLUDEPATH += $$PWD/$${mtdir}
QT += widgets testlib
SOURCES += tst_qidentityproxymodel.cpp $${mtdir}/dynamictreemodel.cpp $${mtdir}/modeltest.cpp
diff --git a/tests/auto/widgets/itemviews/qsortfilterproxymodel/qsortfilterproxymodel.pro b/tests/auto/widgets/itemviews/qsortfilterproxymodel/qsortfilterproxymodel.pro
index 4f0d6545ab..d6e949f73d 100644
--- a/tests/auto/widgets/itemviews/qsortfilterproxymodel/qsortfilterproxymodel.pro
+++ b/tests/auto/widgets/itemviews/qsortfilterproxymodel/qsortfilterproxymodel.pro
@@ -2,7 +2,7 @@ CONFIG += testcase
TARGET = tst_qsortfilterproxymodel
QT += gui widgets testlib
-mtdir = ../../../integrationtests/modeltest
+mtdir = ../../../other/modeltest
INCLUDEPATH += $$PWD/$${mtdir}
SOURCES += tst_qsortfilterproxymodel.cpp $${mtdir}/dynamictreemodel.cpp $${mtdir}/modeltest.cpp