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 similarity index 100% rename from tests/auto/integrationtests/collections/.gitignore rename to tests/auto/other/collections/.gitignore diff --git a/tests/auto/integrationtests/collections/collections.pro b/tests/auto/other/collections/collections.pro similarity index 100% rename from tests/auto/integrationtests/collections/collections.pro rename to tests/auto/other/collections/collections.pro diff --git a/tests/auto/integrationtests/collections/tst_collections.cpp b/tests/auto/other/collections/tst_collections.cpp similarity index 100% rename from tests/auto/integrationtests/collections/tst_collections.cpp rename to tests/auto/other/collections/tst_collections.cpp diff --git a/tests/auto/integrationtests/exceptionsafety/.gitignore b/tests/auto/other/exceptionsafety/.gitignore similarity index 100% rename from tests/auto/integrationtests/exceptionsafety/.gitignore rename to tests/auto/other/exceptionsafety/.gitignore diff --git a/tests/auto/integrationtests/exceptionsafety/exceptionsafety.pro b/tests/auto/other/exceptionsafety/exceptionsafety.pro similarity index 100% rename from tests/auto/integrationtests/exceptionsafety/exceptionsafety.pro rename to tests/auto/other/exceptionsafety/exceptionsafety.pro diff --git a/tests/auto/integrationtests/exceptionsafety/tst_exceptionsafety.cpp b/tests/auto/other/exceptionsafety/tst_exceptionsafety.cpp similarity index 100% rename from tests/auto/integrationtests/exceptionsafety/tst_exceptionsafety.cpp rename to 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 similarity index 100% rename from tests/auto/integrationtests/exceptionsafety_objects/3rdparty/memcheck.h rename to 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 similarity index 100% rename from tests/auto/integrationtests/exceptionsafety_objects/3rdparty/valgrind.h rename to 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 similarity index 100% rename from tests/auto/integrationtests/exceptionsafety_objects/exceptionsafety_objects.pro rename to 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 similarity index 100% rename from tests/auto/integrationtests/exceptionsafety_objects/oomsimulator.h rename to 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 similarity index 100% rename from tests/auto/integrationtests/exceptionsafety_objects/tst_exceptionsafety_objects.cpp rename to 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 similarity index 100% rename from tests/auto/integrationtests/gestures/gestures.pro rename to tests/auto/other/gestures/gestures.pro diff --git a/tests/auto/integrationtests/gestures/tst_gestures.cpp b/tests/auto/other/gestures/tst_gestures.cpp similarity index 100% rename from tests/auto/integrationtests/gestures/tst_gestures.cpp rename to tests/auto/other/gestures/tst_gestures.cpp diff --git a/tests/auto/integrationtests/lancelot/.gitignore b/tests/auto/other/lancelot/.gitignore similarity index 100% rename from tests/auto/integrationtests/lancelot/.gitignore rename to tests/auto/other/lancelot/.gitignore diff --git a/tests/auto/integrationtests/lancelot/images.qrc b/tests/auto/other/lancelot/images.qrc similarity index 100% rename from tests/auto/integrationtests/lancelot/images.qrc rename to tests/auto/other/lancelot/images.qrc diff --git a/tests/auto/integrationtests/lancelot/images/alpha.png b/tests/auto/other/lancelot/images/alpha.png similarity index 100% rename from tests/auto/integrationtests/lancelot/images/alpha.png rename to tests/auto/other/lancelot/images/alpha.png diff --git a/tests/auto/integrationtests/lancelot/images/alpha2x2.png b/tests/auto/other/lancelot/images/alpha2x2.png similarity index 100% rename from tests/auto/integrationtests/lancelot/images/alpha2x2.png rename to tests/auto/other/lancelot/images/alpha2x2.png diff --git a/tests/auto/integrationtests/lancelot/images/bitmap.png b/tests/auto/other/lancelot/images/bitmap.png similarity index 100% rename from tests/auto/integrationtests/lancelot/images/bitmap.png rename to tests/auto/other/lancelot/images/bitmap.png diff --git a/tests/auto/integrationtests/lancelot/images/border.png b/tests/auto/other/lancelot/images/border.png similarity index 100% rename from tests/auto/integrationtests/lancelot/images/border.png rename to tests/auto/other/lancelot/images/border.png diff --git a/tests/auto/integrationtests/lancelot/images/borderimage.png b/tests/auto/other/lancelot/images/borderimage.png similarity index 100% rename from tests/auto/integrationtests/lancelot/images/borderimage.png rename to tests/auto/other/lancelot/images/borderimage.png diff --git a/tests/auto/integrationtests/lancelot/images/dome_argb32.png b/tests/auto/other/lancelot/images/dome_argb32.png similarity index 100% rename from tests/auto/integrationtests/lancelot/images/dome_argb32.png rename to tests/auto/other/lancelot/images/dome_argb32.png diff --git a/tests/auto/integrationtests/lancelot/images/dome_indexed.png b/tests/auto/other/lancelot/images/dome_indexed.png similarity index 100% rename from tests/auto/integrationtests/lancelot/images/dome_indexed.png rename to tests/auto/other/lancelot/images/dome_indexed.png diff --git a/tests/auto/integrationtests/lancelot/images/dome_indexed_mask.png b/tests/auto/other/lancelot/images/dome_indexed_mask.png similarity index 100% rename from tests/auto/integrationtests/lancelot/images/dome_indexed_mask.png rename to tests/auto/other/lancelot/images/dome_indexed_mask.png diff --git a/tests/auto/integrationtests/lancelot/images/dome_mono.png b/tests/auto/other/lancelot/images/dome_mono.png similarity index 100% rename from tests/auto/integrationtests/lancelot/images/dome_mono.png rename to tests/auto/other/lancelot/images/dome_mono.png diff --git a/tests/auto/integrationtests/lancelot/images/dome_mono_128.png b/tests/auto/other/lancelot/images/dome_mono_128.png similarity index 100% rename from tests/auto/integrationtests/lancelot/images/dome_mono_128.png rename to tests/auto/other/lancelot/images/dome_mono_128.png diff --git a/tests/auto/integrationtests/lancelot/images/dome_mono_palette.png b/tests/auto/other/lancelot/images/dome_mono_palette.png similarity index 100% rename from tests/auto/integrationtests/lancelot/images/dome_mono_palette.png rename to tests/auto/other/lancelot/images/dome_mono_palette.png diff --git a/tests/auto/integrationtests/lancelot/images/dome_rgb32.png b/tests/auto/other/lancelot/images/dome_rgb32.png similarity index 100% rename from tests/auto/integrationtests/lancelot/images/dome_rgb32.png rename to tests/auto/other/lancelot/images/dome_rgb32.png diff --git a/tests/auto/integrationtests/lancelot/images/dot.png b/tests/auto/other/lancelot/images/dot.png similarity index 100% rename from tests/auto/integrationtests/lancelot/images/dot.png rename to tests/auto/other/lancelot/images/dot.png diff --git a/tests/auto/integrationtests/lancelot/images/face.png b/tests/auto/other/lancelot/images/face.png similarity index 100% rename from tests/auto/integrationtests/lancelot/images/face.png rename to tests/auto/other/lancelot/images/face.png diff --git a/tests/auto/integrationtests/lancelot/images/gam030.png b/tests/auto/other/lancelot/images/gam030.png similarity index 100% rename from tests/auto/integrationtests/lancelot/images/gam030.png rename to tests/auto/other/lancelot/images/gam030.png diff --git a/tests/auto/integrationtests/lancelot/images/gam045.png b/tests/auto/other/lancelot/images/gam045.png similarity index 100% rename from tests/auto/integrationtests/lancelot/images/gam045.png rename to tests/auto/other/lancelot/images/gam045.png diff --git a/tests/auto/integrationtests/lancelot/images/gam056.png b/tests/auto/other/lancelot/images/gam056.png similarity index 100% rename from tests/auto/integrationtests/lancelot/images/gam056.png rename to tests/auto/other/lancelot/images/gam056.png diff --git a/tests/auto/integrationtests/lancelot/images/gam100.png b/tests/auto/other/lancelot/images/gam100.png similarity index 100% rename from tests/auto/integrationtests/lancelot/images/gam100.png rename to tests/auto/other/lancelot/images/gam100.png diff --git a/tests/auto/integrationtests/lancelot/images/gam200.png b/tests/auto/other/lancelot/images/gam200.png similarity index 100% rename from tests/auto/integrationtests/lancelot/images/gam200.png rename to tests/auto/other/lancelot/images/gam200.png diff --git a/tests/auto/integrationtests/lancelot/images/image.png b/tests/auto/other/lancelot/images/image.png similarity index 100% rename from tests/auto/integrationtests/lancelot/images/image.png rename to tests/auto/other/lancelot/images/image.png diff --git a/tests/auto/integrationtests/lancelot/images/mask.png b/tests/auto/other/lancelot/images/mask.png similarity index 100% rename from tests/auto/integrationtests/lancelot/images/mask.png rename to tests/auto/other/lancelot/images/mask.png diff --git a/tests/auto/integrationtests/lancelot/images/mask_100.png b/tests/auto/other/lancelot/images/mask_100.png similarity index 100% rename from tests/auto/integrationtests/lancelot/images/mask_100.png rename to tests/auto/other/lancelot/images/mask_100.png diff --git a/tests/auto/integrationtests/lancelot/images/masked.png b/tests/auto/other/lancelot/images/masked.png similarity index 100% rename from tests/auto/integrationtests/lancelot/images/masked.png rename to tests/auto/other/lancelot/images/masked.png diff --git a/tests/auto/integrationtests/lancelot/images/sign.png b/tests/auto/other/lancelot/images/sign.png similarity index 100% rename from tests/auto/integrationtests/lancelot/images/sign.png rename to tests/auto/other/lancelot/images/sign.png diff --git a/tests/auto/integrationtests/lancelot/images/solid.png b/tests/auto/other/lancelot/images/solid.png similarity index 100% rename from tests/auto/integrationtests/lancelot/images/solid.png rename to tests/auto/other/lancelot/images/solid.png diff --git a/tests/auto/integrationtests/lancelot/images/solid2x2.png b/tests/auto/other/lancelot/images/solid2x2.png similarity index 100% rename from tests/auto/integrationtests/lancelot/images/solid2x2.png rename to tests/auto/other/lancelot/images/solid2x2.png diff --git a/tests/auto/integrationtests/lancelot/images/struct-image-01.jpg b/tests/auto/other/lancelot/images/struct-image-01.jpg similarity index 100% rename from tests/auto/integrationtests/lancelot/images/struct-image-01.jpg rename to tests/auto/other/lancelot/images/struct-image-01.jpg diff --git a/tests/auto/integrationtests/lancelot/images/struct-image-01.png b/tests/auto/other/lancelot/images/struct-image-01.png similarity index 100% rename from tests/auto/integrationtests/lancelot/images/struct-image-01.png rename to tests/auto/other/lancelot/images/struct-image-01.png diff --git a/tests/auto/integrationtests/lancelot/images/zebra.png b/tests/auto/other/lancelot/images/zebra.png similarity index 100% rename from tests/auto/integrationtests/lancelot/images/zebra.png rename to tests/auto/other/lancelot/images/zebra.png diff --git a/tests/auto/integrationtests/lancelot/lancelot.pro b/tests/auto/other/lancelot/lancelot.pro similarity index 100% rename from tests/auto/integrationtests/lancelot/lancelot.pro rename to tests/auto/other/lancelot/lancelot.pro diff --git a/tests/auto/integrationtests/lancelot/paintcommands.cpp b/tests/auto/other/lancelot/paintcommands.cpp similarity index 100% rename from tests/auto/integrationtests/lancelot/paintcommands.cpp rename to tests/auto/other/lancelot/paintcommands.cpp diff --git a/tests/auto/integrationtests/lancelot/paintcommands.h b/tests/auto/other/lancelot/paintcommands.h similarity index 100% rename from tests/auto/integrationtests/lancelot/paintcommands.h rename to tests/auto/other/lancelot/paintcommands.h diff --git a/tests/auto/integrationtests/lancelot/scripts/aliasing.qps b/tests/auto/other/lancelot/scripts/aliasing.qps similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/aliasing.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/arcs.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/arcs2.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/background.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/background_brush.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/beziers.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/bitmaps.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/borderimage.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/brush_pens.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/brushes.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/clippaths.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/clipping.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/clipping_state.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/cliprects.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/conical_gradients.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/conical_gradients_perspectives.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/dashes.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/degeneratebeziers.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/deviceclipping.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/drawpoints.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/ellipses.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/filltest.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/gradients.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/hinting.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/image_formats.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/images.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/images2.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/join_cap_styles.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/join_cap_styles_duplicate_control_points.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/linear_gradients.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/linear_gradients_perspectives.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/linear_resolving_gradients.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/lineconsistency.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/linedashes.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/linedashes2.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/linedashes2_aa.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/lines.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/lines2.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/pathfill.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/paths.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/paths_aa.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/pens.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/pens_aa.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/pens_cosmetic.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/perspectives.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/perspectives2.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/pixmap_rotation.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/pixmap_scaling.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/pixmap_subpixel.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/pixmaps.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/porter_duff.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/porter_duff2.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/primitives.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/radial_gradients.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/radial_gradients_perspectives.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/rasterops.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/sizes.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/statictext.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/text.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/text_perspectives.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/scripts/tiled_pixmap.qps rename to 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 similarity index 100% rename from tests/auto/integrationtests/lancelot/tst_lancelot.cpp rename to tests/auto/other/lancelot/tst_lancelot.cpp diff --git a/tests/auto/integrationtests/languagechange/.gitignore b/tests/auto/other/languagechange/.gitignore similarity index 100% rename from tests/auto/integrationtests/languagechange/.gitignore rename to tests/auto/other/languagechange/.gitignore diff --git a/tests/auto/integrationtests/languagechange/languagechange.pro b/tests/auto/other/languagechange/languagechange.pro similarity index 100% rename from tests/auto/integrationtests/languagechange/languagechange.pro rename to tests/auto/other/languagechange/languagechange.pro diff --git a/tests/auto/integrationtests/languagechange/tst_languagechange.cpp b/tests/auto/other/languagechange/tst_languagechange.cpp similarity index 100% rename from tests/auto/integrationtests/languagechange/tst_languagechange.cpp rename to tests/auto/other/languagechange/tst_languagechange.cpp diff --git a/tests/auto/integrationtests/macgui/.gitignore b/tests/auto/other/macgui/.gitignore similarity index 100% rename from tests/auto/integrationtests/macgui/.gitignore rename to tests/auto/other/macgui/.gitignore diff --git a/tests/auto/integrationtests/macgui/guitest.cpp b/tests/auto/other/macgui/guitest.cpp similarity index 100% rename from tests/auto/integrationtests/macgui/guitest.cpp rename to tests/auto/other/macgui/guitest.cpp diff --git a/tests/auto/integrationtests/macgui/guitest.h b/tests/auto/other/macgui/guitest.h similarity index 100% rename from tests/auto/integrationtests/macgui/guitest.h rename to tests/auto/other/macgui/guitest.h diff --git a/tests/auto/integrationtests/macgui/macgui.pro b/tests/auto/other/macgui/macgui.pro similarity index 100% rename from tests/auto/integrationtests/macgui/macgui.pro rename to tests/auto/other/macgui/macgui.pro diff --git a/tests/auto/integrationtests/macgui/tst_macgui.cpp b/tests/auto/other/macgui/tst_macgui.cpp similarity index 100% rename from tests/auto/integrationtests/macgui/tst_macgui.cpp rename to tests/auto/other/macgui/tst_macgui.cpp diff --git a/tests/auto/integrationtests/macnativeevents/expectedeventlist.cpp b/tests/auto/other/macnativeevents/expectedeventlist.cpp similarity index 100% rename from tests/auto/integrationtests/macnativeevents/expectedeventlist.cpp rename to tests/auto/other/macnativeevents/expectedeventlist.cpp diff --git a/tests/auto/integrationtests/macnativeevents/expectedeventlist.h b/tests/auto/other/macnativeevents/expectedeventlist.h similarity index 100% rename from tests/auto/integrationtests/macnativeevents/expectedeventlist.h rename to tests/auto/other/macnativeevents/expectedeventlist.h diff --git a/tests/auto/integrationtests/macnativeevents/macnativeevents.pro b/tests/auto/other/macnativeevents/macnativeevents.pro similarity index 100% rename from tests/auto/integrationtests/macnativeevents/macnativeevents.pro rename to tests/auto/other/macnativeevents/macnativeevents.pro diff --git a/tests/auto/integrationtests/macnativeevents/nativeeventlist.cpp b/tests/auto/other/macnativeevents/nativeeventlist.cpp similarity index 100% rename from tests/auto/integrationtests/macnativeevents/nativeeventlist.cpp rename to tests/auto/other/macnativeevents/nativeeventlist.cpp diff --git a/tests/auto/integrationtests/macnativeevents/nativeeventlist.h b/tests/auto/other/macnativeevents/nativeeventlist.h similarity index 100% rename from tests/auto/integrationtests/macnativeevents/nativeeventlist.h rename to tests/auto/other/macnativeevents/nativeeventlist.h diff --git a/tests/auto/integrationtests/macnativeevents/qnativeevents.cpp b/tests/auto/other/macnativeevents/qnativeevents.cpp similarity index 100% rename from tests/auto/integrationtests/macnativeevents/qnativeevents.cpp rename to tests/auto/other/macnativeevents/qnativeevents.cpp diff --git a/tests/auto/integrationtests/macnativeevents/qnativeevents.h b/tests/auto/other/macnativeevents/qnativeevents.h similarity index 100% rename from tests/auto/integrationtests/macnativeevents/qnativeevents.h rename to tests/auto/other/macnativeevents/qnativeevents.h diff --git a/tests/auto/integrationtests/macnativeevents/qnativeevents_mac.cpp b/tests/auto/other/macnativeevents/qnativeevents_mac.cpp similarity index 100% rename from tests/auto/integrationtests/macnativeevents/qnativeevents_mac.cpp rename to 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 similarity index 100% rename from tests/auto/integrationtests/macnativeevents/tst_macnativeevents.cpp rename to 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 similarity index 100% rename from tests/auto/integrationtests/macplist/app/app.pro rename to 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 similarity index 100% rename from tests/auto/integrationtests/macplist/app/main.cpp rename to tests/auto/other/macplist/app/main.cpp diff --git a/tests/auto/integrationtests/macplist/macplist.pro b/tests/auto/other/macplist/macplist.pro similarity index 100% rename from tests/auto/integrationtests/macplist/macplist.pro rename to tests/auto/other/macplist/macplist.pro diff --git a/tests/auto/integrationtests/macplist/test/test.pro b/tests/auto/other/macplist/test/test.pro similarity index 100% rename from tests/auto/integrationtests/macplist/test/test.pro rename to 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 similarity index 100% rename from tests/auto/integrationtests/macplist/tst_macplist.cpp rename to tests/auto/other/macplist/tst_macplist.cpp diff --git a/tests/auto/integrationtests/modeltest/dynamictreemodel.cpp b/tests/auto/other/modeltest/dynamictreemodel.cpp similarity index 100% rename from tests/auto/integrationtests/modeltest/dynamictreemodel.cpp rename to tests/auto/other/modeltest/dynamictreemodel.cpp diff --git a/tests/auto/integrationtests/modeltest/dynamictreemodel.h b/tests/auto/other/modeltest/dynamictreemodel.h similarity index 100% rename from tests/auto/integrationtests/modeltest/dynamictreemodel.h rename to tests/auto/other/modeltest/dynamictreemodel.h diff --git a/tests/auto/integrationtests/modeltest/modeltest.cpp b/tests/auto/other/modeltest/modeltest.cpp similarity index 100% rename from tests/auto/integrationtests/modeltest/modeltest.cpp rename to tests/auto/other/modeltest/modeltest.cpp diff --git a/tests/auto/integrationtests/modeltest/modeltest.h b/tests/auto/other/modeltest/modeltest.h similarity index 100% rename from tests/auto/integrationtests/modeltest/modeltest.h rename to tests/auto/other/modeltest/modeltest.h diff --git a/tests/auto/integrationtests/modeltest/modeltest.pro b/tests/auto/other/modeltest/modeltest.pro similarity index 100% rename from tests/auto/integrationtests/modeltest/modeltest.pro rename to tests/auto/other/modeltest/modeltest.pro diff --git a/tests/auto/integrationtests/modeltest/tst_modeltest.cpp b/tests/auto/other/modeltest/tst_modeltest.cpp similarity index 100% rename from tests/auto/integrationtests/modeltest/tst_modeltest.cpp rename to tests/auto/other/modeltest/tst_modeltest.cpp diff --git a/tests/auto/integrationtests/networkselftest/networkselftest.pro b/tests/auto/other/networkselftest/networkselftest.pro similarity index 100% rename from tests/auto/integrationtests/networkselftest/networkselftest.pro rename to tests/auto/other/networkselftest/networkselftest.pro diff --git a/tests/auto/integrationtests/networkselftest/rfc3252.txt b/tests/auto/other/networkselftest/rfc3252.txt similarity index 100% rename from tests/auto/integrationtests/networkselftest/rfc3252.txt rename to tests/auto/other/networkselftest/rfc3252.txt diff --git a/tests/auto/integrationtests/networkselftest/tst_networkselftest.cpp b/tests/auto/other/networkselftest/tst_networkselftest.cpp similarity index 100% rename from tests/auto/integrationtests/networkselftest/tst_networkselftest.cpp rename to 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 similarity index 100% rename from tests/auto/integrationtests/qaccessibility/.gitignore rename to tests/auto/other/qaccessibility/.gitignore diff --git a/tests/auto/integrationtests/qaccessibility/qaccessibility.pro b/tests/auto/other/qaccessibility/qaccessibility.pro similarity index 100% rename from tests/auto/integrationtests/qaccessibility/qaccessibility.pro rename to tests/auto/other/qaccessibility/qaccessibility.pro diff --git a/tests/auto/integrationtests/qaccessibility/tst_qaccessibility.cpp b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp similarity index 100% rename from tests/auto/integrationtests/qaccessibility/tst_qaccessibility.cpp rename to tests/auto/other/qaccessibility/tst_qaccessibility.cpp diff --git a/tests/auto/integrationtests/qcomplextext/.gitignore b/tests/auto/other/qcomplextext/.gitignore similarity index 100% rename from tests/auto/integrationtests/qcomplextext/.gitignore rename to tests/auto/other/qcomplextext/.gitignore diff --git a/tests/auto/integrationtests/qcomplextext/bidireorderstring.h b/tests/auto/other/qcomplextext/bidireorderstring.h similarity index 100% rename from tests/auto/integrationtests/qcomplextext/bidireorderstring.h rename to tests/auto/other/qcomplextext/bidireorderstring.h diff --git a/tests/auto/integrationtests/qcomplextext/qcomplextext.pro b/tests/auto/other/qcomplextext/qcomplextext.pro similarity index 100% rename from tests/auto/integrationtests/qcomplextext/qcomplextext.pro rename to tests/auto/other/qcomplextext/qcomplextext.pro diff --git a/tests/auto/integrationtests/qcomplextext/tst_qcomplextext.cpp b/tests/auto/other/qcomplextext/tst_qcomplextext.cpp similarity index 100% rename from tests/auto/integrationtests/qcomplextext/tst_qcomplextext.cpp rename to tests/auto/other/qcomplextext/tst_qcomplextext.cpp diff --git a/tests/auto/integrationtests/qdirectpainter/.gitignore b/tests/auto/other/qdirectpainter/.gitignore similarity index 100% rename from tests/auto/integrationtests/qdirectpainter/.gitignore rename to tests/auto/other/qdirectpainter/.gitignore diff --git a/tests/auto/integrationtests/qdirectpainter/qdirectpainter.pro b/tests/auto/other/qdirectpainter/qdirectpainter.pro similarity index 100% rename from tests/auto/integrationtests/qdirectpainter/qdirectpainter.pro rename to tests/auto/other/qdirectpainter/qdirectpainter.pro diff --git a/tests/auto/integrationtests/qdirectpainter/runDirectPainter/main.cpp b/tests/auto/other/qdirectpainter/runDirectPainter/main.cpp similarity index 100% rename from tests/auto/integrationtests/qdirectpainter/runDirectPainter/main.cpp rename to 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 similarity index 100% rename from tests/auto/integrationtests/qdirectpainter/runDirectPainter/runDirectPainter.pro rename to 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 similarity index 100% rename from tests/auto/integrationtests/qdirectpainter/test/test.pro rename to 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 similarity index 100% rename from tests/auto/integrationtests/qdirectpainter/tst_qdirectpainter.cpp rename to tests/auto/other/qdirectpainter/tst_qdirectpainter.cpp diff --git a/tests/auto/integrationtests/qfocusevent/.gitignore b/tests/auto/other/qfocusevent/.gitignore similarity index 100% rename from tests/auto/integrationtests/qfocusevent/.gitignore rename to tests/auto/other/qfocusevent/.gitignore diff --git a/tests/auto/integrationtests/qfocusevent/qfocusevent.pro b/tests/auto/other/qfocusevent/qfocusevent.pro similarity index 100% rename from tests/auto/integrationtests/qfocusevent/qfocusevent.pro rename to tests/auto/other/qfocusevent/qfocusevent.pro diff --git a/tests/auto/integrationtests/qfocusevent/tst_qfocusevent.cpp b/tests/auto/other/qfocusevent/tst_qfocusevent.cpp similarity index 100% rename from tests/auto/integrationtests/qfocusevent/tst_qfocusevent.cpp rename to tests/auto/other/qfocusevent/tst_qfocusevent.cpp diff --git a/tests/auto/integrationtests/qmultiscreen/.gitignore b/tests/auto/other/qmultiscreen/.gitignore similarity index 100% rename from tests/auto/integrationtests/qmultiscreen/.gitignore rename to tests/auto/other/qmultiscreen/.gitignore diff --git a/tests/auto/integrationtests/qmultiscreen/qmultiscreen.pro b/tests/auto/other/qmultiscreen/qmultiscreen.pro similarity index 100% rename from tests/auto/integrationtests/qmultiscreen/qmultiscreen.pro rename to tests/auto/other/qmultiscreen/qmultiscreen.pro diff --git a/tests/auto/integrationtests/qmultiscreen/tst_qmultiscreen.cpp b/tests/auto/other/qmultiscreen/tst_qmultiscreen.cpp similarity index 100% rename from tests/auto/integrationtests/qmultiscreen/tst_qmultiscreen.cpp rename to 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 similarity index 100% rename from tests/auto/integrationtests/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro rename to 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 similarity index 100% rename from tests/auto/integrationtests/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp rename to 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 similarity index 100% rename from tests/auto/integrationtests/qobjectrace/.gitignore rename to tests/auto/other/qobjectrace/.gitignore diff --git a/tests/auto/integrationtests/qobjectrace/qobjectrace.pro b/tests/auto/other/qobjectrace/qobjectrace.pro similarity index 100% rename from tests/auto/integrationtests/qobjectrace/qobjectrace.pro rename to tests/auto/other/qobjectrace/qobjectrace.pro diff --git a/tests/auto/integrationtests/qobjectrace/tst_qobjectrace.cpp b/tests/auto/other/qobjectrace/tst_qobjectrace.cpp similarity index 100% rename from tests/auto/integrationtests/qobjectrace/tst_qobjectrace.cpp rename to 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 similarity index 100% rename from tests/auto/integrationtests/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro rename to 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 similarity index 100% rename from tests/auto/integrationtests/qsharedpointer_and_qwidget/tst_qsharedpointer_and_qwidget.cpp rename to 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 similarity index 100% rename from tests/auto/integrationtests/windowsmobile/test/ddhelper.cpp rename to 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 similarity index 100% rename from tests/auto/integrationtests/windowsmobile/test/ddhelper.h rename to 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 similarity index 100% rename from tests/auto/integrationtests/windowsmobile/test/test.pro rename to 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 similarity index 100% rename from tests/auto/integrationtests/windowsmobile/test/testQMenuBar_current.png rename to tests/auto/other/windowsmobile/test/testQMenuBar_current.png diff --git a/tests/auto/integrationtests/windowsmobile/test/testSimpleWidget_current.png b/tests/auto/other/windowsmobile/test/testSimpleWidget_current.png similarity index 100% rename from tests/auto/integrationtests/windowsmobile/test/testSimpleWidget_current.png rename to tests/auto/other/windowsmobile/test/testSimpleWidget_current.png diff --git a/tests/auto/integrationtests/windowsmobile/test/tst_windowsmobile.cpp b/tests/auto/other/windowsmobile/test/tst_windowsmobile.cpp similarity index 100% rename from tests/auto/integrationtests/windowsmobile/test/tst_windowsmobile.cpp rename to 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 similarity index 100% rename from tests/auto/integrationtests/windowsmobile/test/windowsmobile.qrc rename to 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 similarity index 100% rename from tests/auto/integrationtests/windowsmobile/testQMenuBar/main.cpp rename to 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 similarity index 100% rename from tests/auto/integrationtests/windowsmobile/testQMenuBar/testQMenuBar.pro rename to tests/auto/other/windowsmobile/testQMenuBar/testQMenuBar.pro diff --git a/tests/auto/integrationtests/windowsmobile/windowsmobile.pro b/tests/auto/other/windowsmobile/windowsmobile.pro similarity index 100% rename from tests/auto/integrationtests/windowsmobile/windowsmobile.pro rename to 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