diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 86fe0378871..ded314d9ba1 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -5,6 +5,7 @@ SUBDIRS += \ dbus \ host.pro \ gui.pro \ + integrationtests \ network.pro \ opengl \ sql \ @@ -13,6 +14,7 @@ SUBDIRS += \ v8.pro \ xml \ other.pro \ + widgets \ cross_compile: SUBDIRS -= host.pro cross_compile: SUBDIRS -= tools diff --git a/tests/auto/corelib.pro b/tests/auto/corelib.pro index 7269f890a76..ebdc1cd8c57 100644 --- a/tests/auto/corelib.pro +++ b/tests/auto/corelib.pro @@ -1,7 +1,5 @@ TEMPLATE=subdirs SUBDIRS=\ corelib \ - collections \ - exceptionsafety \ qobjectrace \ utf8 diff --git a/tests/auto/corelib/kernel/kernel.pro b/tests/auto/corelib/kernel/kernel.pro index 42fda6f3008..552c94d35f3 100644 --- a/tests/auto/corelib/kernel/kernel.pro +++ b/tests/auto/corelib/kernel/kernel.pro @@ -13,7 +13,7 @@ SUBDIRS=\ qsignalmapper \ qsocketnotifier \ qtimer \ - # qtipc \ # needs to be moved to qtscript + # qtipc \ # needs to be moved to qtscript (and note that it uses private API) qtranslator \ qvariant \ qwineventnotifier diff --git a/tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro b/tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro index 50730b371f1..eee2222cda4 100644 --- a/tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro +++ b/tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro @@ -1,9 +1,7 @@ load(qttest_p4) -INCLUDEPATH += $$PWD/../../../modeltest +mtdir = ../../../integrationtests/modeltest +INCLUDEPATH += $$PWD/$${mtdir} QT += widgets -SOURCES += tst_qabstractitemmodel.cpp ../../../modeltest/dynamictreemodel.cpp ../../../modeltest/modeltest.cpp -HEADERS += ../../../modeltest/dynamictreemodel.h ../../../modeltest/modeltest.h - - - +SOURCES += tst_qabstractitemmodel.cpp $${mtdir}/dynamictreemodel.cpp $${mtdir}/modeltest.cpp +HEADERS += $${mtdir}/dynamictreemodel.h $${mtdir}/modeltest.h diff --git a/tests/auto/gui.pro b/tests/auto/gui.pro index 7e07df24d8f..d876873bd4f 100644 --- a/tests/auto/gui.pro +++ b/tests/auto/gui.pro @@ -6,130 +6,9 @@ TEMPLATE=subdirs SUBDIRS=\ gui \ - gestures \ - languagechange \ - modeltest \ - qabstractbutton \ - qabstractitemview \ - qabstractprintdialog \ - qabstractproxymodel \ - qabstractscrollarea \ - qabstractslider \ - qabstractspinbox \ - qaction \ - qactiongroup \ - qapplication \ - qboxlayout \ - qbuttongroup \ - qcalendarwidget \ - qcheckbox \ - qcolordialog \ - qcolumnview \ - qcommandlinkbutton \ - qcompleter \ - qcomplextext \ - qdatawidgetmapper \ - qdatetimeedit \ - qdesktopwidget \ - qdial \ - qdialog \ - qdialogbuttonbox \ - qdirmodel \ - qdockwidget \ - qdoublespinbox \ - qdoublevalidator \ - qerrormessage \ - qfiledialog \ - qfiledialog2 \ - qfileiconprovider \ - qfilesystemmodel \ - qfocusframe \ - qfontcombobox \ - qfontdialog \ - qformlayout \ - qgraphicsanchorlayout \ - qgraphicsanchorlayout1 \ - qgraphicseffect \ - qgraphicseffectsource \ - qgraphicsgridlayout \ - qgraphicsitem \ - qgraphicsitemanimation \ - qgraphicslayout \ - qgraphicslayoutitem \ - qgraphicslinearlayout \ - qgraphicsobject \ - qgraphicspixmapitem \ - qgraphicspolygonitem \ - qgraphicsproxywidget \ - qgraphicsscene \ - qgraphicssceneindex \ - qgraphicstransform \ - qgraphicsview \ - qgraphicswidget \ - qgridlayout \ - qgroupbox \ - qheaderview \ - qidentityproxymodel \ - qinputcontext \ - qinputdialog \ - qintvalidator \ - qitemdelegate \ - qitemeditorfactory \ - qitemselectionmodel \ - qitemview \ - qlabel \ - qlcdnumber \ - qlineedit \ - qlistview \ - qlistwidget \ - qmacstyle \ - qmainwindow \ - qmdisubwindow \ - qmessagebox \ - qnetworkaccessmanager_and_qprogressdialog \ qopengl \ - qplaintextedit \ - qprogressbar \ - qprogressdialog \ - qpushbutton \ - qradiobutton \ - qregexpvalidator \ - qscrollarea \ - qscrollbar \ - qscroller \ - qsharedpointer_and_qwidget \ - qsidebar \ - qsizegrip \ - qslider \ - qsortfilterproxymodel \ - qsound \ - qspinbox \ - qstackedlayout \ - qstackedwidget \ - qstandarditem \ - qstandarditemmodel \ - qstatusbar \ - qstringlistmodel \ - qstyle \ - qstyleoption \ - qstylesheetstyle \ - qsystemtrayicon \ - qtabbar \ - qtableview \ - qtablewidget \ - qtoolbar \ - qtoolbox \ - qtooltip \ qtransformedscreen \ - qtreeview \ - qtreewidget \ - qtreewidgetitemiterator \ - qundogroup \ - qundostack \ - qwidget_window \ - qwidgetaction \ qwindowsurface \ - qwizard \ qwsembedwidget \ qwsinputmethod \ qwswindowsystem \ @@ -139,13 +18,6 @@ SUBDIRS=\ mac*:SUBDIRS -= \ qwindowsurface \ -# This test can only be run on Mac OS -!mac:SUBDIRS -= \ - qmacstyle \ - -# This test takes too long to run on IRIX, so skip it on that platform -irix-*:SUBDIRS -= qitemview - # These tests are only valid for QWS !embedded|wince*:SUBDIRS -= \ qtransformedscreen \ @@ -153,28 +25,3 @@ irix-*:SUBDIRS -= qitemview qwsinputmethod \ qwswindowsystem \ -# These tests require the cleanlooks style -!contains(styles, cleanlooks):SUBDIRS -= \ - qgraphicswidget \ - qgraphicsproxywidget \ - -win32:SUBDIRS -= qtextpiecetable - -!contains(QT_CONFIG, private_tests): SUBDIRS -= \ - qcolumnview \ - qgraphicsanchorlayout \ - qgraphicsanchorlayout1 \ - qgraphicsitem \ - qgraphicsscene \ - qgraphicssceneindex \ - qlistwidget \ - qmainwindow \ - qpathclipper \ - qpixmapcache \ - qsidebar \ - qstylesheetstyle \ - qtextlayout \ - qtextpiecetable \ - qtipc \ - qtoolbar \ - diff --git a/tests/auto/collections/.gitignore b/tests/auto/integrationtests/collections/.gitignore similarity index 100% rename from tests/auto/collections/.gitignore rename to tests/auto/integrationtests/collections/.gitignore diff --git a/tests/auto/collections/collections.pro b/tests/auto/integrationtests/collections/collections.pro similarity index 100% rename from tests/auto/collections/collections.pro rename to tests/auto/integrationtests/collections/collections.pro diff --git a/tests/auto/collections/tst_collections.cpp b/tests/auto/integrationtests/collections/tst_collections.cpp similarity index 100% rename from tests/auto/collections/tst_collections.cpp rename to tests/auto/integrationtests/collections/tst_collections.cpp diff --git a/tests/auto/exceptionsafety/.gitignore b/tests/auto/integrationtests/exceptionsafety/.gitignore similarity index 100% rename from tests/auto/exceptionsafety/.gitignore rename to tests/auto/integrationtests/exceptionsafety/.gitignore diff --git a/tests/auto/exceptionsafety/exceptionsafety.pro b/tests/auto/integrationtests/exceptionsafety/exceptionsafety.pro similarity index 100% rename from tests/auto/exceptionsafety/exceptionsafety.pro rename to tests/auto/integrationtests/exceptionsafety/exceptionsafety.pro diff --git a/tests/auto/exceptionsafety/tst_exceptionsafety.cpp b/tests/auto/integrationtests/exceptionsafety/tst_exceptionsafety.cpp similarity index 100% rename from tests/auto/exceptionsafety/tst_exceptionsafety.cpp rename to tests/auto/integrationtests/exceptionsafety/tst_exceptionsafety.cpp diff --git a/tests/auto/exceptionsafety_objects/3rdparty/memcheck.h b/tests/auto/integrationtests/exceptionsafety_objects/3rdparty/memcheck.h similarity index 100% rename from tests/auto/exceptionsafety_objects/3rdparty/memcheck.h rename to tests/auto/integrationtests/exceptionsafety_objects/3rdparty/memcheck.h diff --git a/tests/auto/exceptionsafety_objects/3rdparty/valgrind.h b/tests/auto/integrationtests/exceptionsafety_objects/3rdparty/valgrind.h similarity index 100% rename from tests/auto/exceptionsafety_objects/3rdparty/valgrind.h rename to tests/auto/integrationtests/exceptionsafety_objects/3rdparty/valgrind.h diff --git a/tests/auto/exceptionsafety_objects/exceptionsafety_objects.pro b/tests/auto/integrationtests/exceptionsafety_objects/exceptionsafety_objects.pro similarity index 100% rename from tests/auto/exceptionsafety_objects/exceptionsafety_objects.pro rename to tests/auto/integrationtests/exceptionsafety_objects/exceptionsafety_objects.pro diff --git a/tests/auto/exceptionsafety_objects/oomsimulator.h b/tests/auto/integrationtests/exceptionsafety_objects/oomsimulator.h similarity index 100% rename from tests/auto/exceptionsafety_objects/oomsimulator.h rename to tests/auto/integrationtests/exceptionsafety_objects/oomsimulator.h diff --git a/tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp b/tests/auto/integrationtests/exceptionsafety_objects/tst_exceptionsafety_objects.cpp similarity index 100% rename from tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp rename to tests/auto/integrationtests/exceptionsafety_objects/tst_exceptionsafety_objects.cpp diff --git a/tests/auto/gestures/gestures.pro b/tests/auto/integrationtests/gestures/gestures.pro similarity index 100% rename from tests/auto/gestures/gestures.pro rename to tests/auto/integrationtests/gestures/gestures.pro diff --git a/tests/auto/gestures/tst_gestures.cpp b/tests/auto/integrationtests/gestures/tst_gestures.cpp similarity index 100% rename from tests/auto/gestures/tst_gestures.cpp rename to tests/auto/integrationtests/gestures/tst_gestures.cpp diff --git a/tests/auto/integrationtests/integrationtests.pro b/tests/auto/integrationtests/integrationtests.pro new file mode 100644 index 00000000000..1d58f2c6650 --- /dev/null +++ b/tests/auto/integrationtests/integrationtests.pro @@ -0,0 +1,35 @@ +TEMPLATE=subdirs +SUBDIRS=\ + collections \ + exceptionsafety \ + exceptionsafety_objects \ + gestures \ + lancelot \ + languagechange \ + macgui \ + macnativeevents \ + macplist \ + modeltest \ + networkselftest \ + qaccessibility \ + qcomplextext \ + qdirectpainter \ + qfocusevent \ + qmultiscreen \ + qnetworkaccessmanager_and_qprogressdialog \ + qsharedpointer_and_qwidget \ + windowsmobile \ + +wince*|!contains(QT_CONFIG, accessibility):SUBDIRS -= qaccessibility + +!mac|qpa: SUBDIRS -= \ + macgui \ + macnativeevents \ + macplist \ + +!embedded|wince*: SUBDIRS -= \ + qdirectpainter \ + qmultiscreen \ + +!linux*-g++*:SUBDIRS -= exceptionsafety_objects + diff --git a/tests/auto/lancelot/.gitignore b/tests/auto/integrationtests/lancelot/.gitignore similarity index 100% rename from tests/auto/lancelot/.gitignore rename to tests/auto/integrationtests/lancelot/.gitignore diff --git a/tests/auto/lancelot/images.qrc b/tests/auto/integrationtests/lancelot/images.qrc similarity index 100% rename from tests/auto/lancelot/images.qrc rename to tests/auto/integrationtests/lancelot/images.qrc diff --git a/tests/auto/lancelot/images/alpha.png b/tests/auto/integrationtests/lancelot/images/alpha.png similarity index 100% rename from tests/auto/lancelot/images/alpha.png rename to tests/auto/integrationtests/lancelot/images/alpha.png diff --git a/tests/auto/lancelot/images/alpha2x2.png b/tests/auto/integrationtests/lancelot/images/alpha2x2.png similarity index 100% rename from tests/auto/lancelot/images/alpha2x2.png rename to tests/auto/integrationtests/lancelot/images/alpha2x2.png diff --git a/tests/auto/lancelot/images/bitmap.png b/tests/auto/integrationtests/lancelot/images/bitmap.png similarity index 100% rename from tests/auto/lancelot/images/bitmap.png rename to tests/auto/integrationtests/lancelot/images/bitmap.png diff --git a/tests/auto/lancelot/images/border.png b/tests/auto/integrationtests/lancelot/images/border.png similarity index 100% rename from tests/auto/lancelot/images/border.png rename to tests/auto/integrationtests/lancelot/images/border.png diff --git a/tests/auto/lancelot/images/borderimage.png b/tests/auto/integrationtests/lancelot/images/borderimage.png similarity index 100% rename from tests/auto/lancelot/images/borderimage.png rename to tests/auto/integrationtests/lancelot/images/borderimage.png diff --git a/tests/auto/lancelot/images/dome_argb32.png b/tests/auto/integrationtests/lancelot/images/dome_argb32.png similarity index 100% rename from tests/auto/lancelot/images/dome_argb32.png rename to tests/auto/integrationtests/lancelot/images/dome_argb32.png diff --git a/tests/auto/lancelot/images/dome_indexed.png b/tests/auto/integrationtests/lancelot/images/dome_indexed.png similarity index 100% rename from tests/auto/lancelot/images/dome_indexed.png rename to tests/auto/integrationtests/lancelot/images/dome_indexed.png diff --git a/tests/auto/lancelot/images/dome_indexed_mask.png b/tests/auto/integrationtests/lancelot/images/dome_indexed_mask.png similarity index 100% rename from tests/auto/lancelot/images/dome_indexed_mask.png rename to tests/auto/integrationtests/lancelot/images/dome_indexed_mask.png diff --git a/tests/auto/lancelot/images/dome_mono.png b/tests/auto/integrationtests/lancelot/images/dome_mono.png similarity index 100% rename from tests/auto/lancelot/images/dome_mono.png rename to tests/auto/integrationtests/lancelot/images/dome_mono.png diff --git a/tests/auto/lancelot/images/dome_mono_128.png b/tests/auto/integrationtests/lancelot/images/dome_mono_128.png similarity index 100% rename from tests/auto/lancelot/images/dome_mono_128.png rename to tests/auto/integrationtests/lancelot/images/dome_mono_128.png diff --git a/tests/auto/lancelot/images/dome_mono_palette.png b/tests/auto/integrationtests/lancelot/images/dome_mono_palette.png similarity index 100% rename from tests/auto/lancelot/images/dome_mono_palette.png rename to tests/auto/integrationtests/lancelot/images/dome_mono_palette.png diff --git a/tests/auto/lancelot/images/dome_rgb32.png b/tests/auto/integrationtests/lancelot/images/dome_rgb32.png similarity index 100% rename from tests/auto/lancelot/images/dome_rgb32.png rename to tests/auto/integrationtests/lancelot/images/dome_rgb32.png diff --git a/tests/auto/lancelot/images/dot.png b/tests/auto/integrationtests/lancelot/images/dot.png similarity index 100% rename from tests/auto/lancelot/images/dot.png rename to tests/auto/integrationtests/lancelot/images/dot.png diff --git a/tests/auto/lancelot/images/face.png b/tests/auto/integrationtests/lancelot/images/face.png similarity index 100% rename from tests/auto/lancelot/images/face.png rename to tests/auto/integrationtests/lancelot/images/face.png diff --git a/tests/auto/lancelot/images/gam030.png b/tests/auto/integrationtests/lancelot/images/gam030.png similarity index 100% rename from tests/auto/lancelot/images/gam030.png rename to tests/auto/integrationtests/lancelot/images/gam030.png diff --git a/tests/auto/lancelot/images/gam045.png b/tests/auto/integrationtests/lancelot/images/gam045.png similarity index 100% rename from tests/auto/lancelot/images/gam045.png rename to tests/auto/integrationtests/lancelot/images/gam045.png diff --git a/tests/auto/lancelot/images/gam056.png b/tests/auto/integrationtests/lancelot/images/gam056.png similarity index 100% rename from tests/auto/lancelot/images/gam056.png rename to tests/auto/integrationtests/lancelot/images/gam056.png diff --git a/tests/auto/lancelot/images/gam100.png b/tests/auto/integrationtests/lancelot/images/gam100.png similarity index 100% rename from tests/auto/lancelot/images/gam100.png rename to tests/auto/integrationtests/lancelot/images/gam100.png diff --git a/tests/auto/lancelot/images/gam200.png b/tests/auto/integrationtests/lancelot/images/gam200.png similarity index 100% rename from tests/auto/lancelot/images/gam200.png rename to tests/auto/integrationtests/lancelot/images/gam200.png diff --git a/tests/auto/lancelot/images/image.png b/tests/auto/integrationtests/lancelot/images/image.png similarity index 100% rename from tests/auto/lancelot/images/image.png rename to tests/auto/integrationtests/lancelot/images/image.png diff --git a/tests/auto/lancelot/images/mask.png b/tests/auto/integrationtests/lancelot/images/mask.png similarity index 100% rename from tests/auto/lancelot/images/mask.png rename to tests/auto/integrationtests/lancelot/images/mask.png diff --git a/tests/auto/lancelot/images/mask_100.png b/tests/auto/integrationtests/lancelot/images/mask_100.png similarity index 100% rename from tests/auto/lancelot/images/mask_100.png rename to tests/auto/integrationtests/lancelot/images/mask_100.png diff --git a/tests/auto/lancelot/images/masked.png b/tests/auto/integrationtests/lancelot/images/masked.png similarity index 100% rename from tests/auto/lancelot/images/masked.png rename to tests/auto/integrationtests/lancelot/images/masked.png diff --git a/tests/auto/lancelot/images/sign.png b/tests/auto/integrationtests/lancelot/images/sign.png similarity index 100% rename from tests/auto/lancelot/images/sign.png rename to tests/auto/integrationtests/lancelot/images/sign.png diff --git a/tests/auto/lancelot/images/solid.png b/tests/auto/integrationtests/lancelot/images/solid.png similarity index 100% rename from tests/auto/lancelot/images/solid.png rename to tests/auto/integrationtests/lancelot/images/solid.png diff --git a/tests/auto/lancelot/images/solid2x2.png b/tests/auto/integrationtests/lancelot/images/solid2x2.png similarity index 100% rename from tests/auto/lancelot/images/solid2x2.png rename to tests/auto/integrationtests/lancelot/images/solid2x2.png diff --git a/tests/auto/lancelot/images/struct-image-01.jpg b/tests/auto/integrationtests/lancelot/images/struct-image-01.jpg similarity index 100% rename from tests/auto/lancelot/images/struct-image-01.jpg rename to tests/auto/integrationtests/lancelot/images/struct-image-01.jpg diff --git a/tests/auto/lancelot/images/struct-image-01.png b/tests/auto/integrationtests/lancelot/images/struct-image-01.png similarity index 100% rename from tests/auto/lancelot/images/struct-image-01.png rename to tests/auto/integrationtests/lancelot/images/struct-image-01.png diff --git a/tests/auto/lancelot/images/zebra.png b/tests/auto/integrationtests/lancelot/images/zebra.png similarity index 100% rename from tests/auto/lancelot/images/zebra.png rename to tests/auto/integrationtests/lancelot/images/zebra.png diff --git a/tests/auto/lancelot/lancelot.pro b/tests/auto/integrationtests/lancelot/lancelot.pro similarity index 85% rename from tests/auto/lancelot/lancelot.pro rename to tests/auto/integrationtests/lancelot/lancelot.pro index 5b61c32aa55..d34732e06e1 100644 --- a/tests/auto/lancelot/lancelot.pro +++ b/tests/auto/integrationtests/lancelot/lancelot.pro @@ -7,7 +7,7 @@ SOURCES += tst_lancelot.cpp \ HEADERS += paintcommands.h RESOURCES += images.qrc -include($$PWD/../../baselineserver/shared/qbaselinetest.pri) +include($$PWD/../../../baselineserver/shared/qbaselinetest.pri) !wince*:DEFINES += SRCDIR=\\\"$$PWD\\\" linux-g++-maemo:DEFINES += USE_RUNTIME_DIR diff --git a/tests/auto/lancelot/paintcommands.cpp b/tests/auto/integrationtests/lancelot/paintcommands.cpp similarity index 100% rename from tests/auto/lancelot/paintcommands.cpp rename to tests/auto/integrationtests/lancelot/paintcommands.cpp diff --git a/tests/auto/lancelot/paintcommands.h b/tests/auto/integrationtests/lancelot/paintcommands.h similarity index 100% rename from tests/auto/lancelot/paintcommands.h rename to tests/auto/integrationtests/lancelot/paintcommands.h diff --git a/tests/auto/lancelot/scripts/aliasing.qps b/tests/auto/integrationtests/lancelot/scripts/aliasing.qps similarity index 100% rename from tests/auto/lancelot/scripts/aliasing.qps rename to tests/auto/integrationtests/lancelot/scripts/aliasing.qps diff --git a/tests/auto/lancelot/scripts/arcs.qps b/tests/auto/integrationtests/lancelot/scripts/arcs.qps similarity index 100% rename from tests/auto/lancelot/scripts/arcs.qps rename to tests/auto/integrationtests/lancelot/scripts/arcs.qps diff --git a/tests/auto/lancelot/scripts/arcs2.qps b/tests/auto/integrationtests/lancelot/scripts/arcs2.qps similarity index 100% rename from tests/auto/lancelot/scripts/arcs2.qps rename to tests/auto/integrationtests/lancelot/scripts/arcs2.qps diff --git a/tests/auto/lancelot/scripts/background.qps b/tests/auto/integrationtests/lancelot/scripts/background.qps similarity index 100% rename from tests/auto/lancelot/scripts/background.qps rename to tests/auto/integrationtests/lancelot/scripts/background.qps diff --git a/tests/auto/lancelot/scripts/background_brush.qps b/tests/auto/integrationtests/lancelot/scripts/background_brush.qps similarity index 100% rename from tests/auto/lancelot/scripts/background_brush.qps rename to tests/auto/integrationtests/lancelot/scripts/background_brush.qps diff --git a/tests/auto/lancelot/scripts/beziers.qps b/tests/auto/integrationtests/lancelot/scripts/beziers.qps similarity index 100% rename from tests/auto/lancelot/scripts/beziers.qps rename to tests/auto/integrationtests/lancelot/scripts/beziers.qps diff --git a/tests/auto/lancelot/scripts/bitmaps.qps b/tests/auto/integrationtests/lancelot/scripts/bitmaps.qps similarity index 100% rename from tests/auto/lancelot/scripts/bitmaps.qps rename to tests/auto/integrationtests/lancelot/scripts/bitmaps.qps diff --git a/tests/auto/lancelot/scripts/borderimage.qps b/tests/auto/integrationtests/lancelot/scripts/borderimage.qps similarity index 100% rename from tests/auto/lancelot/scripts/borderimage.qps rename to tests/auto/integrationtests/lancelot/scripts/borderimage.qps diff --git a/tests/auto/lancelot/scripts/brush_pens.qps b/tests/auto/integrationtests/lancelot/scripts/brush_pens.qps similarity index 100% rename from tests/auto/lancelot/scripts/brush_pens.qps rename to tests/auto/integrationtests/lancelot/scripts/brush_pens.qps diff --git a/tests/auto/lancelot/scripts/brushes.qps b/tests/auto/integrationtests/lancelot/scripts/brushes.qps similarity index 100% rename from tests/auto/lancelot/scripts/brushes.qps rename to tests/auto/integrationtests/lancelot/scripts/brushes.qps diff --git a/tests/auto/lancelot/scripts/clippaths.qps b/tests/auto/integrationtests/lancelot/scripts/clippaths.qps similarity index 100% rename from tests/auto/lancelot/scripts/clippaths.qps rename to tests/auto/integrationtests/lancelot/scripts/clippaths.qps diff --git a/tests/auto/lancelot/scripts/clipping.qps b/tests/auto/integrationtests/lancelot/scripts/clipping.qps similarity index 100% rename from tests/auto/lancelot/scripts/clipping.qps rename to tests/auto/integrationtests/lancelot/scripts/clipping.qps diff --git a/tests/auto/lancelot/scripts/clipping_state.qps b/tests/auto/integrationtests/lancelot/scripts/clipping_state.qps similarity index 100% rename from tests/auto/lancelot/scripts/clipping_state.qps rename to tests/auto/integrationtests/lancelot/scripts/clipping_state.qps diff --git a/tests/auto/lancelot/scripts/cliprects.qps b/tests/auto/integrationtests/lancelot/scripts/cliprects.qps similarity index 100% rename from tests/auto/lancelot/scripts/cliprects.qps rename to tests/auto/integrationtests/lancelot/scripts/cliprects.qps diff --git a/tests/auto/lancelot/scripts/conical_gradients.qps b/tests/auto/integrationtests/lancelot/scripts/conical_gradients.qps similarity index 100% rename from tests/auto/lancelot/scripts/conical_gradients.qps rename to tests/auto/integrationtests/lancelot/scripts/conical_gradients.qps diff --git a/tests/auto/lancelot/scripts/conical_gradients_perspectives.qps b/tests/auto/integrationtests/lancelot/scripts/conical_gradients_perspectives.qps similarity index 100% rename from tests/auto/lancelot/scripts/conical_gradients_perspectives.qps rename to tests/auto/integrationtests/lancelot/scripts/conical_gradients_perspectives.qps diff --git a/tests/auto/lancelot/scripts/dashes.qps b/tests/auto/integrationtests/lancelot/scripts/dashes.qps similarity index 100% rename from tests/auto/lancelot/scripts/dashes.qps rename to tests/auto/integrationtests/lancelot/scripts/dashes.qps diff --git a/tests/auto/lancelot/scripts/degeneratebeziers.qps b/tests/auto/integrationtests/lancelot/scripts/degeneratebeziers.qps similarity index 100% rename from tests/auto/lancelot/scripts/degeneratebeziers.qps rename to tests/auto/integrationtests/lancelot/scripts/degeneratebeziers.qps diff --git a/tests/auto/lancelot/scripts/deviceclipping.qps b/tests/auto/integrationtests/lancelot/scripts/deviceclipping.qps similarity index 100% rename from tests/auto/lancelot/scripts/deviceclipping.qps rename to tests/auto/integrationtests/lancelot/scripts/deviceclipping.qps diff --git a/tests/auto/lancelot/scripts/drawpoints.qps b/tests/auto/integrationtests/lancelot/scripts/drawpoints.qps similarity index 100% rename from tests/auto/lancelot/scripts/drawpoints.qps rename to tests/auto/integrationtests/lancelot/scripts/drawpoints.qps diff --git a/tests/auto/lancelot/scripts/ellipses.qps b/tests/auto/integrationtests/lancelot/scripts/ellipses.qps similarity index 100% rename from tests/auto/lancelot/scripts/ellipses.qps rename to tests/auto/integrationtests/lancelot/scripts/ellipses.qps diff --git a/tests/auto/lancelot/scripts/filltest.qps b/tests/auto/integrationtests/lancelot/scripts/filltest.qps similarity index 100% rename from tests/auto/lancelot/scripts/filltest.qps rename to tests/auto/integrationtests/lancelot/scripts/filltest.qps diff --git a/tests/auto/lancelot/scripts/gradients.qps b/tests/auto/integrationtests/lancelot/scripts/gradients.qps similarity index 100% rename from tests/auto/lancelot/scripts/gradients.qps rename to tests/auto/integrationtests/lancelot/scripts/gradients.qps diff --git a/tests/auto/lancelot/scripts/hinting.qps b/tests/auto/integrationtests/lancelot/scripts/hinting.qps similarity index 100% rename from tests/auto/lancelot/scripts/hinting.qps rename to tests/auto/integrationtests/lancelot/scripts/hinting.qps diff --git a/tests/auto/lancelot/scripts/image_formats.qps b/tests/auto/integrationtests/lancelot/scripts/image_formats.qps similarity index 100% rename from tests/auto/lancelot/scripts/image_formats.qps rename to tests/auto/integrationtests/lancelot/scripts/image_formats.qps diff --git a/tests/auto/lancelot/scripts/images.qps b/tests/auto/integrationtests/lancelot/scripts/images.qps similarity index 100% rename from tests/auto/lancelot/scripts/images.qps rename to tests/auto/integrationtests/lancelot/scripts/images.qps diff --git a/tests/auto/lancelot/scripts/images2.qps b/tests/auto/integrationtests/lancelot/scripts/images2.qps similarity index 100% rename from tests/auto/lancelot/scripts/images2.qps rename to tests/auto/integrationtests/lancelot/scripts/images2.qps diff --git a/tests/auto/lancelot/scripts/join_cap_styles.qps b/tests/auto/integrationtests/lancelot/scripts/join_cap_styles.qps similarity index 100% rename from tests/auto/lancelot/scripts/join_cap_styles.qps rename to tests/auto/integrationtests/lancelot/scripts/join_cap_styles.qps diff --git a/tests/auto/lancelot/scripts/join_cap_styles_duplicate_control_points.qps b/tests/auto/integrationtests/lancelot/scripts/join_cap_styles_duplicate_control_points.qps similarity index 100% rename from tests/auto/lancelot/scripts/join_cap_styles_duplicate_control_points.qps rename to tests/auto/integrationtests/lancelot/scripts/join_cap_styles_duplicate_control_points.qps diff --git a/tests/auto/lancelot/scripts/linear_gradients.qps b/tests/auto/integrationtests/lancelot/scripts/linear_gradients.qps similarity index 100% rename from tests/auto/lancelot/scripts/linear_gradients.qps rename to tests/auto/integrationtests/lancelot/scripts/linear_gradients.qps diff --git a/tests/auto/lancelot/scripts/linear_gradients_perspectives.qps b/tests/auto/integrationtests/lancelot/scripts/linear_gradients_perspectives.qps similarity index 100% rename from tests/auto/lancelot/scripts/linear_gradients_perspectives.qps rename to tests/auto/integrationtests/lancelot/scripts/linear_gradients_perspectives.qps diff --git a/tests/auto/lancelot/scripts/linear_resolving_gradients.qps b/tests/auto/integrationtests/lancelot/scripts/linear_resolving_gradients.qps similarity index 100% rename from tests/auto/lancelot/scripts/linear_resolving_gradients.qps rename to tests/auto/integrationtests/lancelot/scripts/linear_resolving_gradients.qps diff --git a/tests/auto/lancelot/scripts/lineconsistency.qps b/tests/auto/integrationtests/lancelot/scripts/lineconsistency.qps similarity index 100% rename from tests/auto/lancelot/scripts/lineconsistency.qps rename to tests/auto/integrationtests/lancelot/scripts/lineconsistency.qps diff --git a/tests/auto/lancelot/scripts/linedashes.qps b/tests/auto/integrationtests/lancelot/scripts/linedashes.qps similarity index 100% rename from tests/auto/lancelot/scripts/linedashes.qps rename to tests/auto/integrationtests/lancelot/scripts/linedashes.qps diff --git a/tests/auto/lancelot/scripts/linedashes2.qps b/tests/auto/integrationtests/lancelot/scripts/linedashes2.qps similarity index 100% rename from tests/auto/lancelot/scripts/linedashes2.qps rename to tests/auto/integrationtests/lancelot/scripts/linedashes2.qps diff --git a/tests/auto/lancelot/scripts/linedashes2_aa.qps b/tests/auto/integrationtests/lancelot/scripts/linedashes2_aa.qps similarity index 100% rename from tests/auto/lancelot/scripts/linedashes2_aa.qps rename to tests/auto/integrationtests/lancelot/scripts/linedashes2_aa.qps diff --git a/tests/auto/lancelot/scripts/lines.qps b/tests/auto/integrationtests/lancelot/scripts/lines.qps similarity index 100% rename from tests/auto/lancelot/scripts/lines.qps rename to tests/auto/integrationtests/lancelot/scripts/lines.qps diff --git a/tests/auto/lancelot/scripts/lines2.qps b/tests/auto/integrationtests/lancelot/scripts/lines2.qps similarity index 100% rename from tests/auto/lancelot/scripts/lines2.qps rename to tests/auto/integrationtests/lancelot/scripts/lines2.qps diff --git a/tests/auto/lancelot/scripts/pathfill.qps b/tests/auto/integrationtests/lancelot/scripts/pathfill.qps similarity index 100% rename from tests/auto/lancelot/scripts/pathfill.qps rename to tests/auto/integrationtests/lancelot/scripts/pathfill.qps diff --git a/tests/auto/lancelot/scripts/paths.qps b/tests/auto/integrationtests/lancelot/scripts/paths.qps similarity index 100% rename from tests/auto/lancelot/scripts/paths.qps rename to tests/auto/integrationtests/lancelot/scripts/paths.qps diff --git a/tests/auto/lancelot/scripts/paths_aa.qps b/tests/auto/integrationtests/lancelot/scripts/paths_aa.qps similarity index 100% rename from tests/auto/lancelot/scripts/paths_aa.qps rename to tests/auto/integrationtests/lancelot/scripts/paths_aa.qps diff --git a/tests/auto/lancelot/scripts/pens.qps b/tests/auto/integrationtests/lancelot/scripts/pens.qps similarity index 100% rename from tests/auto/lancelot/scripts/pens.qps rename to tests/auto/integrationtests/lancelot/scripts/pens.qps diff --git a/tests/auto/lancelot/scripts/pens_aa.qps b/tests/auto/integrationtests/lancelot/scripts/pens_aa.qps similarity index 100% rename from tests/auto/lancelot/scripts/pens_aa.qps rename to tests/auto/integrationtests/lancelot/scripts/pens_aa.qps diff --git a/tests/auto/lancelot/scripts/pens_cosmetic.qps b/tests/auto/integrationtests/lancelot/scripts/pens_cosmetic.qps similarity index 100% rename from tests/auto/lancelot/scripts/pens_cosmetic.qps rename to tests/auto/integrationtests/lancelot/scripts/pens_cosmetic.qps diff --git a/tests/auto/lancelot/scripts/perspectives.qps b/tests/auto/integrationtests/lancelot/scripts/perspectives.qps similarity index 100% rename from tests/auto/lancelot/scripts/perspectives.qps rename to tests/auto/integrationtests/lancelot/scripts/perspectives.qps diff --git a/tests/auto/lancelot/scripts/perspectives2.qps b/tests/auto/integrationtests/lancelot/scripts/perspectives2.qps similarity index 100% rename from tests/auto/lancelot/scripts/perspectives2.qps rename to tests/auto/integrationtests/lancelot/scripts/perspectives2.qps diff --git a/tests/auto/lancelot/scripts/pixmap_rotation.qps b/tests/auto/integrationtests/lancelot/scripts/pixmap_rotation.qps similarity index 100% rename from tests/auto/lancelot/scripts/pixmap_rotation.qps rename to tests/auto/integrationtests/lancelot/scripts/pixmap_rotation.qps diff --git a/tests/auto/lancelot/scripts/pixmap_scaling.qps b/tests/auto/integrationtests/lancelot/scripts/pixmap_scaling.qps similarity index 100% rename from tests/auto/lancelot/scripts/pixmap_scaling.qps rename to tests/auto/integrationtests/lancelot/scripts/pixmap_scaling.qps diff --git a/tests/auto/lancelot/scripts/pixmap_subpixel.qps b/tests/auto/integrationtests/lancelot/scripts/pixmap_subpixel.qps similarity index 100% rename from tests/auto/lancelot/scripts/pixmap_subpixel.qps rename to tests/auto/integrationtests/lancelot/scripts/pixmap_subpixel.qps diff --git a/tests/auto/lancelot/scripts/pixmaps.qps b/tests/auto/integrationtests/lancelot/scripts/pixmaps.qps similarity index 100% rename from tests/auto/lancelot/scripts/pixmaps.qps rename to tests/auto/integrationtests/lancelot/scripts/pixmaps.qps diff --git a/tests/auto/lancelot/scripts/porter_duff.qps b/tests/auto/integrationtests/lancelot/scripts/porter_duff.qps similarity index 100% rename from tests/auto/lancelot/scripts/porter_duff.qps rename to tests/auto/integrationtests/lancelot/scripts/porter_duff.qps diff --git a/tests/auto/lancelot/scripts/porter_duff2.qps b/tests/auto/integrationtests/lancelot/scripts/porter_duff2.qps similarity index 100% rename from tests/auto/lancelot/scripts/porter_duff2.qps rename to tests/auto/integrationtests/lancelot/scripts/porter_duff2.qps diff --git a/tests/auto/lancelot/scripts/primitives.qps b/tests/auto/integrationtests/lancelot/scripts/primitives.qps similarity index 100% rename from tests/auto/lancelot/scripts/primitives.qps rename to tests/auto/integrationtests/lancelot/scripts/primitives.qps diff --git a/tests/auto/lancelot/scripts/radial_gradients.qps b/tests/auto/integrationtests/lancelot/scripts/radial_gradients.qps similarity index 100% rename from tests/auto/lancelot/scripts/radial_gradients.qps rename to tests/auto/integrationtests/lancelot/scripts/radial_gradients.qps diff --git a/tests/auto/lancelot/scripts/radial_gradients_perspectives.qps b/tests/auto/integrationtests/lancelot/scripts/radial_gradients_perspectives.qps similarity index 100% rename from tests/auto/lancelot/scripts/radial_gradients_perspectives.qps rename to tests/auto/integrationtests/lancelot/scripts/radial_gradients_perspectives.qps diff --git a/tests/auto/lancelot/scripts/rasterops.qps b/tests/auto/integrationtests/lancelot/scripts/rasterops.qps similarity index 100% rename from tests/auto/lancelot/scripts/rasterops.qps rename to tests/auto/integrationtests/lancelot/scripts/rasterops.qps diff --git a/tests/auto/lancelot/scripts/sizes.qps b/tests/auto/integrationtests/lancelot/scripts/sizes.qps similarity index 100% rename from tests/auto/lancelot/scripts/sizes.qps rename to tests/auto/integrationtests/lancelot/scripts/sizes.qps diff --git a/tests/auto/lancelot/scripts/statictext.qps b/tests/auto/integrationtests/lancelot/scripts/statictext.qps similarity index 100% rename from tests/auto/lancelot/scripts/statictext.qps rename to tests/auto/integrationtests/lancelot/scripts/statictext.qps diff --git a/tests/auto/lancelot/scripts/text.qps b/tests/auto/integrationtests/lancelot/scripts/text.qps similarity index 100% rename from tests/auto/lancelot/scripts/text.qps rename to tests/auto/integrationtests/lancelot/scripts/text.qps diff --git a/tests/auto/lancelot/scripts/text_perspectives.qps b/tests/auto/integrationtests/lancelot/scripts/text_perspectives.qps similarity index 100% rename from tests/auto/lancelot/scripts/text_perspectives.qps rename to tests/auto/integrationtests/lancelot/scripts/text_perspectives.qps diff --git a/tests/auto/lancelot/scripts/tiled_pixmap.qps b/tests/auto/integrationtests/lancelot/scripts/tiled_pixmap.qps similarity index 100% rename from tests/auto/lancelot/scripts/tiled_pixmap.qps rename to tests/auto/integrationtests/lancelot/scripts/tiled_pixmap.qps diff --git a/tests/auto/lancelot/tst_lancelot.cpp b/tests/auto/integrationtests/lancelot/tst_lancelot.cpp similarity index 100% rename from tests/auto/lancelot/tst_lancelot.cpp rename to tests/auto/integrationtests/lancelot/tst_lancelot.cpp diff --git a/tests/auto/languagechange/.gitignore b/tests/auto/integrationtests/languagechange/.gitignore similarity index 100% rename from tests/auto/languagechange/.gitignore rename to tests/auto/integrationtests/languagechange/.gitignore diff --git a/tests/auto/languagechange/languagechange.pro b/tests/auto/integrationtests/languagechange/languagechange.pro similarity index 100% rename from tests/auto/languagechange/languagechange.pro rename to tests/auto/integrationtests/languagechange/languagechange.pro diff --git a/tests/auto/languagechange/tst_languagechange.cpp b/tests/auto/integrationtests/languagechange/tst_languagechange.cpp similarity index 100% rename from tests/auto/languagechange/tst_languagechange.cpp rename to tests/auto/integrationtests/languagechange/tst_languagechange.cpp diff --git a/tests/auto/macgui/.gitignore b/tests/auto/integrationtests/macgui/.gitignore similarity index 100% rename from tests/auto/macgui/.gitignore rename to tests/auto/integrationtests/macgui/.gitignore diff --git a/tests/auto/macgui/guitest.cpp b/tests/auto/integrationtests/macgui/guitest.cpp similarity index 100% rename from tests/auto/macgui/guitest.cpp rename to tests/auto/integrationtests/macgui/guitest.cpp diff --git a/tests/auto/macgui/guitest.h b/tests/auto/integrationtests/macgui/guitest.h similarity index 100% rename from tests/auto/macgui/guitest.h rename to tests/auto/integrationtests/macgui/guitest.h diff --git a/tests/auto/macgui/macgui.pro b/tests/auto/integrationtests/macgui/macgui.pro similarity index 100% rename from tests/auto/macgui/macgui.pro rename to tests/auto/integrationtests/macgui/macgui.pro diff --git a/tests/auto/macgui/tst_macgui.cpp b/tests/auto/integrationtests/macgui/tst_macgui.cpp similarity index 100% rename from tests/auto/macgui/tst_macgui.cpp rename to tests/auto/integrationtests/macgui/tst_macgui.cpp diff --git a/tests/auto/macnativeevents/expectedeventlist.cpp b/tests/auto/integrationtests/macnativeevents/expectedeventlist.cpp similarity index 100% rename from tests/auto/macnativeevents/expectedeventlist.cpp rename to tests/auto/integrationtests/macnativeevents/expectedeventlist.cpp diff --git a/tests/auto/macnativeevents/expectedeventlist.h b/tests/auto/integrationtests/macnativeevents/expectedeventlist.h similarity index 100% rename from tests/auto/macnativeevents/expectedeventlist.h rename to tests/auto/integrationtests/macnativeevents/expectedeventlist.h diff --git a/tests/auto/macnativeevents/macnativeevents.pro b/tests/auto/integrationtests/macnativeevents/macnativeevents.pro similarity index 100% rename from tests/auto/macnativeevents/macnativeevents.pro rename to tests/auto/integrationtests/macnativeevents/macnativeevents.pro diff --git a/tests/auto/macnativeevents/nativeeventlist.cpp b/tests/auto/integrationtests/macnativeevents/nativeeventlist.cpp similarity index 100% rename from tests/auto/macnativeevents/nativeeventlist.cpp rename to tests/auto/integrationtests/macnativeevents/nativeeventlist.cpp diff --git a/tests/auto/macnativeevents/nativeeventlist.h b/tests/auto/integrationtests/macnativeevents/nativeeventlist.h similarity index 100% rename from tests/auto/macnativeevents/nativeeventlist.h rename to tests/auto/integrationtests/macnativeevents/nativeeventlist.h diff --git a/tests/auto/macnativeevents/qnativeevents.cpp b/tests/auto/integrationtests/macnativeevents/qnativeevents.cpp similarity index 100% rename from tests/auto/macnativeevents/qnativeevents.cpp rename to tests/auto/integrationtests/macnativeevents/qnativeevents.cpp diff --git a/tests/auto/macnativeevents/qnativeevents.h b/tests/auto/integrationtests/macnativeevents/qnativeevents.h similarity index 100% rename from tests/auto/macnativeevents/qnativeevents.h rename to tests/auto/integrationtests/macnativeevents/qnativeevents.h diff --git a/tests/auto/macnativeevents/qnativeevents_mac.cpp b/tests/auto/integrationtests/macnativeevents/qnativeevents_mac.cpp similarity index 100% rename from tests/auto/macnativeevents/qnativeevents_mac.cpp rename to tests/auto/integrationtests/macnativeevents/qnativeevents_mac.cpp diff --git a/tests/auto/macnativeevents/tst_macnativeevents.cpp b/tests/auto/integrationtests/macnativeevents/tst_macnativeevents.cpp similarity index 100% rename from tests/auto/macnativeevents/tst_macnativeevents.cpp rename to tests/auto/integrationtests/macnativeevents/tst_macnativeevents.cpp diff --git a/tests/auto/macplist/app/app.pro b/tests/auto/integrationtests/macplist/app/app.pro similarity index 100% rename from tests/auto/macplist/app/app.pro rename to tests/auto/integrationtests/macplist/app/app.pro diff --git a/tests/auto/macplist/app/main.cpp b/tests/auto/integrationtests/macplist/app/main.cpp similarity index 100% rename from tests/auto/macplist/app/main.cpp rename to tests/auto/integrationtests/macplist/app/main.cpp diff --git a/tests/auto/macplist/macplist.pro b/tests/auto/integrationtests/macplist/macplist.pro similarity index 100% rename from tests/auto/macplist/macplist.pro rename to tests/auto/integrationtests/macplist/macplist.pro diff --git a/tests/auto/macplist/test/test.pro b/tests/auto/integrationtests/macplist/test/test.pro similarity index 100% rename from tests/auto/macplist/test/test.pro rename to tests/auto/integrationtests/macplist/test/test.pro diff --git a/tests/auto/macplist/tst_macplist.cpp b/tests/auto/integrationtests/macplist/tst_macplist.cpp similarity index 100% rename from tests/auto/macplist/tst_macplist.cpp rename to tests/auto/integrationtests/macplist/tst_macplist.cpp diff --git a/tests/auto/modeltest/dynamictreemodel.cpp b/tests/auto/integrationtests/modeltest/dynamictreemodel.cpp similarity index 100% rename from tests/auto/modeltest/dynamictreemodel.cpp rename to tests/auto/integrationtests/modeltest/dynamictreemodel.cpp diff --git a/tests/auto/modeltest/dynamictreemodel.h b/tests/auto/integrationtests/modeltest/dynamictreemodel.h similarity index 100% rename from tests/auto/modeltest/dynamictreemodel.h rename to tests/auto/integrationtests/modeltest/dynamictreemodel.h diff --git a/tests/auto/modeltest/modeltest.cpp b/tests/auto/integrationtests/modeltest/modeltest.cpp similarity index 100% rename from tests/auto/modeltest/modeltest.cpp rename to tests/auto/integrationtests/modeltest/modeltest.cpp diff --git a/tests/auto/modeltest/modeltest.h b/tests/auto/integrationtests/modeltest/modeltest.h similarity index 100% rename from tests/auto/modeltest/modeltest.h rename to tests/auto/integrationtests/modeltest/modeltest.h diff --git a/tests/auto/modeltest/modeltest.pro b/tests/auto/integrationtests/modeltest/modeltest.pro similarity index 100% rename from tests/auto/modeltest/modeltest.pro rename to tests/auto/integrationtests/modeltest/modeltest.pro diff --git a/tests/auto/modeltest/tst_modeltest.cpp b/tests/auto/integrationtests/modeltest/tst_modeltest.cpp similarity index 100% rename from tests/auto/modeltest/tst_modeltest.cpp rename to tests/auto/integrationtests/modeltest/tst_modeltest.cpp diff --git a/tests/auto/networkselftest/networkselftest.pro b/tests/auto/integrationtests/networkselftest/networkselftest.pro similarity index 100% rename from tests/auto/networkselftest/networkselftest.pro rename to tests/auto/integrationtests/networkselftest/networkselftest.pro diff --git a/tests/auto/networkselftest/rfc3252.txt b/tests/auto/integrationtests/networkselftest/rfc3252.txt similarity index 100% rename from tests/auto/networkselftest/rfc3252.txt rename to tests/auto/integrationtests/networkselftest/rfc3252.txt diff --git a/tests/auto/networkselftest/tst_networkselftest.cpp b/tests/auto/integrationtests/networkselftest/tst_networkselftest.cpp similarity index 99% rename from tests/auto/networkselftest/tst_networkselftest.cpp rename to tests/auto/integrationtests/networkselftest/tst_networkselftest.cpp index 033ee57cdd1..341054c533b 100644 --- a/tests/auto/networkselftest/tst_networkselftest.cpp +++ b/tests/auto/integrationtests/networkselftest/tst_networkselftest.cpp @@ -50,7 +50,7 @@ #include #endif -#include "../network-settings.h" +#include "../../network-settings.h" class tst_NetworkSelfTest: public QObject { diff --git a/tests/auto/qaccessibility/.gitignore b/tests/auto/integrationtests/qaccessibility/.gitignore similarity index 100% rename from tests/auto/qaccessibility/.gitignore rename to tests/auto/integrationtests/qaccessibility/.gitignore diff --git a/tests/auto/qaccessibility/qaccessibility.pro b/tests/auto/integrationtests/qaccessibility/qaccessibility.pro similarity index 100% rename from tests/auto/qaccessibility/qaccessibility.pro rename to tests/auto/integrationtests/qaccessibility/qaccessibility.pro diff --git a/tests/auto/qaccessibility/tst_qaccessibility.cpp b/tests/auto/integrationtests/qaccessibility/tst_qaccessibility.cpp similarity index 100% rename from tests/auto/qaccessibility/tst_qaccessibility.cpp rename to tests/auto/integrationtests/qaccessibility/tst_qaccessibility.cpp diff --git a/tests/auto/qcomplextext/.gitignore b/tests/auto/integrationtests/qcomplextext/.gitignore similarity index 100% rename from tests/auto/qcomplextext/.gitignore rename to tests/auto/integrationtests/qcomplextext/.gitignore diff --git a/tests/auto/qcomplextext/bidireorderstring.h b/tests/auto/integrationtests/qcomplextext/bidireorderstring.h similarity index 100% rename from tests/auto/qcomplextext/bidireorderstring.h rename to tests/auto/integrationtests/qcomplextext/bidireorderstring.h diff --git a/tests/auto/qcomplextext/qcomplextext.pro b/tests/auto/integrationtests/qcomplextext/qcomplextext.pro similarity index 100% rename from tests/auto/qcomplextext/qcomplextext.pro rename to tests/auto/integrationtests/qcomplextext/qcomplextext.pro diff --git a/tests/auto/qcomplextext/tst_qcomplextext.cpp b/tests/auto/integrationtests/qcomplextext/tst_qcomplextext.cpp similarity index 100% rename from tests/auto/qcomplextext/tst_qcomplextext.cpp rename to tests/auto/integrationtests/qcomplextext/tst_qcomplextext.cpp diff --git a/tests/auto/qdirectpainter/.gitignore b/tests/auto/integrationtests/qdirectpainter/.gitignore similarity index 100% rename from tests/auto/qdirectpainter/.gitignore rename to tests/auto/integrationtests/qdirectpainter/.gitignore diff --git a/tests/auto/qdirectpainter/qdirectpainter.pro b/tests/auto/integrationtests/qdirectpainter/qdirectpainter.pro similarity index 100% rename from tests/auto/qdirectpainter/qdirectpainter.pro rename to tests/auto/integrationtests/qdirectpainter/qdirectpainter.pro diff --git a/tests/auto/qdirectpainter/runDirectPainter/main.cpp b/tests/auto/integrationtests/qdirectpainter/runDirectPainter/main.cpp similarity index 100% rename from tests/auto/qdirectpainter/runDirectPainter/main.cpp rename to tests/auto/integrationtests/qdirectpainter/runDirectPainter/main.cpp diff --git a/tests/auto/qdirectpainter/runDirectPainter/runDirectPainter.pro b/tests/auto/integrationtests/qdirectpainter/runDirectPainter/runDirectPainter.pro similarity index 100% rename from tests/auto/qdirectpainter/runDirectPainter/runDirectPainter.pro rename to tests/auto/integrationtests/qdirectpainter/runDirectPainter/runDirectPainter.pro diff --git a/tests/auto/qdirectpainter/test/test.pro b/tests/auto/integrationtests/qdirectpainter/test/test.pro similarity index 100% rename from tests/auto/qdirectpainter/test/test.pro rename to tests/auto/integrationtests/qdirectpainter/test/test.pro diff --git a/tests/auto/qdirectpainter/tst_qdirectpainter.cpp b/tests/auto/integrationtests/qdirectpainter/tst_qdirectpainter.cpp similarity index 100% rename from tests/auto/qdirectpainter/tst_qdirectpainter.cpp rename to tests/auto/integrationtests/qdirectpainter/tst_qdirectpainter.cpp diff --git a/tests/auto/qfocusevent/.gitignore b/tests/auto/integrationtests/qfocusevent/.gitignore similarity index 100% rename from tests/auto/qfocusevent/.gitignore rename to tests/auto/integrationtests/qfocusevent/.gitignore diff --git a/tests/auto/qfocusevent/qfocusevent.pro b/tests/auto/integrationtests/qfocusevent/qfocusevent.pro similarity index 100% rename from tests/auto/qfocusevent/qfocusevent.pro rename to tests/auto/integrationtests/qfocusevent/qfocusevent.pro diff --git a/tests/auto/qfocusevent/tst_qfocusevent.cpp b/tests/auto/integrationtests/qfocusevent/tst_qfocusevent.cpp similarity index 100% rename from tests/auto/qfocusevent/tst_qfocusevent.cpp rename to tests/auto/integrationtests/qfocusevent/tst_qfocusevent.cpp diff --git a/tests/auto/qmultiscreen/.gitignore b/tests/auto/integrationtests/qmultiscreen/.gitignore similarity index 100% rename from tests/auto/qmultiscreen/.gitignore rename to tests/auto/integrationtests/qmultiscreen/.gitignore diff --git a/tests/auto/qmultiscreen/qmultiscreen.pro b/tests/auto/integrationtests/qmultiscreen/qmultiscreen.pro similarity index 100% rename from tests/auto/qmultiscreen/qmultiscreen.pro rename to tests/auto/integrationtests/qmultiscreen/qmultiscreen.pro diff --git a/tests/auto/qmultiscreen/tst_qmultiscreen.cpp b/tests/auto/integrationtests/qmultiscreen/tst_qmultiscreen.cpp similarity index 100% rename from tests/auto/qmultiscreen/tst_qmultiscreen.cpp rename to tests/auto/integrationtests/qmultiscreen/tst_qmultiscreen.cpp diff --git a/tests/auto/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro b/tests/auto/integrationtests/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro similarity index 100% rename from tests/auto/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro rename to tests/auto/integrationtests/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro diff --git a/tests/auto/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp b/tests/auto/integrationtests/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp similarity index 99% rename from tests/auto/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp rename to tests/auto/integrationtests/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp index d22f72261be..abf5aa528c5 100644 --- a/tests/auto/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp +++ b/tests/auto/integrationtests/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp @@ -49,7 +49,7 @@ #include #include -#include "../network-settings.h" +#include "../../network-settings.h" class tst_QNetworkAccessManager_And_QProgressDialog : public QObject diff --git a/tests/auto/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro b/tests/auto/integrationtests/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro similarity index 100% rename from tests/auto/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro rename to tests/auto/integrationtests/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro diff --git a/tests/auto/qsharedpointer_and_qwidget/tst_qsharedpointer_and_qwidget.cpp b/tests/auto/integrationtests/qsharedpointer_and_qwidget/tst_qsharedpointer_and_qwidget.cpp similarity index 100% rename from tests/auto/qsharedpointer_and_qwidget/tst_qsharedpointer_and_qwidget.cpp rename to tests/auto/integrationtests/qsharedpointer_and_qwidget/tst_qsharedpointer_and_qwidget.cpp diff --git a/tests/auto/windowsmobile/test/ddhelper.cpp b/tests/auto/integrationtests/windowsmobile/test/ddhelper.cpp similarity index 100% rename from tests/auto/windowsmobile/test/ddhelper.cpp rename to tests/auto/integrationtests/windowsmobile/test/ddhelper.cpp diff --git a/tests/auto/windowsmobile/test/ddhelper.h b/tests/auto/integrationtests/windowsmobile/test/ddhelper.h similarity index 100% rename from tests/auto/windowsmobile/test/ddhelper.h rename to tests/auto/integrationtests/windowsmobile/test/ddhelper.h diff --git a/tests/auto/windowsmobile/test/test.pro b/tests/auto/integrationtests/windowsmobile/test/test.pro similarity index 100% rename from tests/auto/windowsmobile/test/test.pro rename to tests/auto/integrationtests/windowsmobile/test/test.pro diff --git a/tests/auto/windowsmobile/test/testQMenuBar_current.png b/tests/auto/integrationtests/windowsmobile/test/testQMenuBar_current.png similarity index 100% rename from tests/auto/windowsmobile/test/testQMenuBar_current.png rename to tests/auto/integrationtests/windowsmobile/test/testQMenuBar_current.png diff --git a/tests/auto/windowsmobile/test/testSimpleWidget_current.png b/tests/auto/integrationtests/windowsmobile/test/testSimpleWidget_current.png similarity index 100% rename from tests/auto/windowsmobile/test/testSimpleWidget_current.png rename to tests/auto/integrationtests/windowsmobile/test/testSimpleWidget_current.png diff --git a/tests/auto/windowsmobile/test/tst_windowsmobile.cpp b/tests/auto/integrationtests/windowsmobile/test/tst_windowsmobile.cpp similarity index 100% rename from tests/auto/windowsmobile/test/tst_windowsmobile.cpp rename to tests/auto/integrationtests/windowsmobile/test/tst_windowsmobile.cpp diff --git a/tests/auto/windowsmobile/test/windowsmobile.qrc b/tests/auto/integrationtests/windowsmobile/test/windowsmobile.qrc similarity index 100% rename from tests/auto/windowsmobile/test/windowsmobile.qrc rename to tests/auto/integrationtests/windowsmobile/test/windowsmobile.qrc diff --git a/tests/auto/windowsmobile/testQMenuBar/main.cpp b/tests/auto/integrationtests/windowsmobile/testQMenuBar/main.cpp similarity index 100% rename from tests/auto/windowsmobile/testQMenuBar/main.cpp rename to tests/auto/integrationtests/windowsmobile/testQMenuBar/main.cpp diff --git a/tests/auto/windowsmobile/testQMenuBar/testQMenuBar.pro b/tests/auto/integrationtests/windowsmobile/testQMenuBar/testQMenuBar.pro similarity index 100% rename from tests/auto/windowsmobile/testQMenuBar/testQMenuBar.pro rename to tests/auto/integrationtests/windowsmobile/testQMenuBar/testQMenuBar.pro diff --git a/tests/auto/windowsmobile/windowsmobile.pro b/tests/auto/integrationtests/windowsmobile/windowsmobile.pro similarity index 100% rename from tests/auto/windowsmobile/windowsmobile.pro rename to tests/auto/integrationtests/windowsmobile/windowsmobile.pro diff --git a/tests/auto/network.pro b/tests/auto/network.pro index 21388bc2811..d4d07fa4269 100644 --- a/tests/auto/network.pro +++ b/tests/auto/network.pro @@ -5,5 +5,4 @@ TEMPLATE=subdirs SUBDIRS=\ network \ - networkselftest \ qobjectperformance diff --git a/tests/auto/other.pro b/tests/auto/other.pro index 5848cdb7555..f15811940b7 100644 --- a/tests/auto/other.pro +++ b/tests/auto/other.pro @@ -4,45 +4,4 @@ TEMPLATE=subdirs SUBDIRS=\ other \ -# baselineexample \ Just an example demonstrating qbaselinetest usage - exceptionsafety_objects \ - lancelot \ - macgui \ - macnativeevents \ - macplist \ - qaccessibility \ - qcombobox \ - qdirectpainter \ - qfocusevent \ - qlayout \ - qmdiarea \ - qmenu \ - qmenubar \ - qmultiscreen \ - qsplitter \ - qtabwidget \ - qtextbrowser \ - qtextedit \ - qtoolbutton \ - qwidget \ - qworkspace \ - windowsmobile \ qmetaobjectbuilder - -wince*|!contains(QT_CONFIG, accessibility):SUBDIRS -= qaccessibility - -!mac|qpa: SUBDIRS -= \ - macgui \ - macnativeevents \ - macplist \ - -!embedded|wince*: SUBDIRS -= \ - qdirectpainter \ - qmultiscreen \ - -!linux*-g++*:SUBDIRS -= exceptionsafety_objects - -# Following tests depends on private API -!contains(QT_CONFIG, private_tests): SUBDIRS -= \ - qcombobox \ - qtextedit \ diff --git a/tests/auto/qidentityproxymodel/qidentityproxymodel.pro b/tests/auto/qidentityproxymodel/qidentityproxymodel.pro deleted file mode 100644 index 7df0e65d03e..00000000000 --- a/tests/auto/qidentityproxymodel/qidentityproxymodel.pro +++ /dev/null @@ -1,7 +0,0 @@ -load(qttest_p4) - -INCLUDEPATH += $$PWD/../modeltest - -QT += widgets -SOURCES += tst_qidentityproxymodel.cpp ../modeltest/dynamictreemodel.cpp ../modeltest/modeltest.cpp -HEADERS += ../modeltest/dynamictreemodel.h ../modeltest/modeltest.h diff --git a/tests/auto/qsortfilterproxymodel/qsortfilterproxymodel.pro b/tests/auto/qsortfilterproxymodel/qsortfilterproxymodel.pro deleted file mode 100644 index a60fbac9448..00000000000 --- a/tests/auto/qsortfilterproxymodel/qsortfilterproxymodel.pro +++ /dev/null @@ -1,9 +0,0 @@ -load(qttest_p4) - -QT += gui widgets - -INCLUDEPATH += $$PWD/../modeltest - -SOURCES += tst_qsortfilterproxymodel.cpp ../modeltest/dynamictreemodel.cpp ../modeltest/modeltest.cpp -HEADERS += ../modeltest/dynamictreemodel.h ../modeltest/modeltest.h - diff --git a/tests/auto/widgets/dialogs/dialogs.pro b/tests/auto/widgets/dialogs/dialogs.pro new file mode 100644 index 00000000000..e74323a3050 --- /dev/null +++ b/tests/auto/widgets/dialogs/dialogs.pro @@ -0,0 +1,18 @@ +TEMPLATE=subdirs +SUBDIRS=\ + qabstractprintdialog \ + qcolordialog \ + qdialog \ + qerrormessage \ + qfiledialog \ + qfiledialog2 \ + qfilesystemmodel \ + qfontdialog \ + qinputdialog \ + qmessagebox \ + qprogressdialog \ + qsidebar \ + qwizard \ + +!contains(QT_CONFIG, private_tests): SUBDIRS -= \ + qsidebar \ diff --git a/tests/auto/qabstractprintdialog/.gitignore b/tests/auto/widgets/dialogs/qabstractprintdialog/.gitignore similarity index 100% rename from tests/auto/qabstractprintdialog/.gitignore rename to tests/auto/widgets/dialogs/qabstractprintdialog/.gitignore diff --git a/tests/auto/qabstractprintdialog/qabstractprintdialog.pro b/tests/auto/widgets/dialogs/qabstractprintdialog/qabstractprintdialog.pro similarity index 100% rename from tests/auto/qabstractprintdialog/qabstractprintdialog.pro rename to tests/auto/widgets/dialogs/qabstractprintdialog/qabstractprintdialog.pro diff --git a/tests/auto/qabstractprintdialog/tst_qabstractprintdialog.cpp b/tests/auto/widgets/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp similarity index 100% rename from tests/auto/qabstractprintdialog/tst_qabstractprintdialog.cpp rename to tests/auto/widgets/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp diff --git a/tests/auto/qcolordialog/.gitignore b/tests/auto/widgets/dialogs/qcolordialog/.gitignore similarity index 100% rename from tests/auto/qcolordialog/.gitignore rename to tests/auto/widgets/dialogs/qcolordialog/.gitignore diff --git a/tests/auto/qcolordialog/qcolordialog.pro b/tests/auto/widgets/dialogs/qcolordialog/qcolordialog.pro similarity index 100% rename from tests/auto/qcolordialog/qcolordialog.pro rename to tests/auto/widgets/dialogs/qcolordialog/qcolordialog.pro diff --git a/tests/auto/qcolordialog/tst_qcolordialog.cpp b/tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp similarity index 100% rename from tests/auto/qcolordialog/tst_qcolordialog.cpp rename to tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp diff --git a/tests/auto/qdialog/.gitignore b/tests/auto/widgets/dialogs/qdialog/.gitignore similarity index 100% rename from tests/auto/qdialog/.gitignore rename to tests/auto/widgets/dialogs/qdialog/.gitignore diff --git a/tests/auto/qdialog/qdialog.pro b/tests/auto/widgets/dialogs/qdialog/qdialog.pro similarity index 100% rename from tests/auto/qdialog/qdialog.pro rename to tests/auto/widgets/dialogs/qdialog/qdialog.pro diff --git a/tests/auto/qdialog/tst_qdialog.cpp b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp similarity index 100% rename from tests/auto/qdialog/tst_qdialog.cpp rename to tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp diff --git a/tests/auto/qerrormessage/.gitignore b/tests/auto/widgets/dialogs/qerrormessage/.gitignore similarity index 100% rename from tests/auto/qerrormessage/.gitignore rename to tests/auto/widgets/dialogs/qerrormessage/.gitignore diff --git a/tests/auto/qerrormessage/qerrormessage.pro b/tests/auto/widgets/dialogs/qerrormessage/qerrormessage.pro similarity index 100% rename from tests/auto/qerrormessage/qerrormessage.pro rename to tests/auto/widgets/dialogs/qerrormessage/qerrormessage.pro diff --git a/tests/auto/qerrormessage/tst_qerrormessage.cpp b/tests/auto/widgets/dialogs/qerrormessage/tst_qerrormessage.cpp similarity index 100% rename from tests/auto/qerrormessage/tst_qerrormessage.cpp rename to tests/auto/widgets/dialogs/qerrormessage/tst_qerrormessage.cpp diff --git a/tests/auto/qfiledialog/.gitignore b/tests/auto/widgets/dialogs/qfiledialog/.gitignore similarity index 100% rename from tests/auto/qfiledialog/.gitignore rename to tests/auto/widgets/dialogs/qfiledialog/.gitignore diff --git a/tests/auto/qfiledialog/qfiledialog.pro b/tests/auto/widgets/dialogs/qfiledialog/qfiledialog.pro similarity index 100% rename from tests/auto/qfiledialog/qfiledialog.pro rename to tests/auto/widgets/dialogs/qfiledialog/qfiledialog.pro diff --git a/tests/auto/qfiledialog/resources/file.txt b/tests/auto/widgets/dialogs/qfiledialog/resources/file.txt similarity index 100% rename from tests/auto/qfiledialog/resources/file.txt rename to tests/auto/widgets/dialogs/qfiledialog/resources/file.txt diff --git a/tests/auto/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp similarity index 99% rename from tests/auto/qfiledialog/tst_qfiledialog.cpp rename to tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp index 2a14ecbc282..9abcd407d0e 100644 --- a/tests/auto/qfiledialog/tst_qfiledialog.cpp +++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp @@ -68,7 +68,7 @@ #include #include -#include "../network-settings.h" +#include "../../../network-settings.h" //TESTED_CLASS= //TESTED_FILES= diff --git a/tests/auto/qfiledialog2/qfiledialog2.pro b/tests/auto/widgets/dialogs/qfiledialog2/qfiledialog2.pro similarity index 100% rename from tests/auto/qfiledialog2/qfiledialog2.pro rename to tests/auto/widgets/dialogs/qfiledialog2/qfiledialog2.pro diff --git a/tests/auto/qfiledialog2/tst_qfiledialog2.cpp b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp similarity index 99% rename from tests/auto/qfiledialog2/tst_qfiledialog2.cpp rename to tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp index dad1e903f9c..a2d18eb8479 100644 --- a/tests/auto/qfiledialog2/tst_qfiledialog2.cpp +++ b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp @@ -60,11 +60,11 @@ #include #include #include -#include "../../../src/widgets/dialogs/qsidebar_p.h" -#include "../../../src/widgets/dialogs/qfilesystemmodel_p.h" -#include "../../../src/widgets/dialogs/qfiledialog_p.h" +#include "../../../../../src/widgets/dialogs/qsidebar_p.h" +#include "../../../../../src/widgets/dialogs/qfilesystemmodel_p.h" +#include "../../../../../src/widgets/dialogs/qfiledialog_p.h" -#include "../network-settings.h" +#include "../../../network-settings.h" //TESTED_CLASS= //TESTED_FILES= diff --git a/tests/auto/qfilesystemmodel/.gitignore b/tests/auto/widgets/dialogs/qfilesystemmodel/.gitignore similarity index 100% rename from tests/auto/qfilesystemmodel/.gitignore rename to tests/auto/widgets/dialogs/qfilesystemmodel/.gitignore diff --git a/tests/auto/qfilesystemmodel/qfilesystemmodel.pro b/tests/auto/widgets/dialogs/qfilesystemmodel/qfilesystemmodel.pro similarity index 100% rename from tests/auto/qfilesystemmodel/qfilesystemmodel.pro rename to tests/auto/widgets/dialogs/qfilesystemmodel/qfilesystemmodel.pro diff --git a/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp similarity index 100% rename from tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp rename to tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp diff --git a/tests/auto/qfontdialog/.gitignore b/tests/auto/widgets/dialogs/qfontdialog/.gitignore similarity index 100% rename from tests/auto/qfontdialog/.gitignore rename to tests/auto/widgets/dialogs/qfontdialog/.gitignore diff --git a/tests/auto/qfontdialog/qfontdialog.pro b/tests/auto/widgets/dialogs/qfontdialog/qfontdialog.pro similarity index 100% rename from tests/auto/qfontdialog/qfontdialog.pro rename to tests/auto/widgets/dialogs/qfontdialog/qfontdialog.pro diff --git a/tests/auto/qfontdialog/tst_qfontdialog.cpp b/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp similarity index 100% rename from tests/auto/qfontdialog/tst_qfontdialog.cpp rename to tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp diff --git a/tests/auto/qfontdialog/tst_qfontdialog_mac_helpers.mm b/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog_mac_helpers.mm similarity index 100% rename from tests/auto/qfontdialog/tst_qfontdialog_mac_helpers.mm rename to tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog_mac_helpers.mm diff --git a/tests/auto/qinputdialog/.gitignore b/tests/auto/widgets/dialogs/qinputdialog/.gitignore similarity index 100% rename from tests/auto/qinputdialog/.gitignore rename to tests/auto/widgets/dialogs/qinputdialog/.gitignore diff --git a/tests/auto/qinputdialog/qinputdialog.pro b/tests/auto/widgets/dialogs/qinputdialog/qinputdialog.pro similarity index 100% rename from tests/auto/qinputdialog/qinputdialog.pro rename to tests/auto/widgets/dialogs/qinputdialog/qinputdialog.pro diff --git a/tests/auto/qinputdialog/tst_qinputdialog.cpp b/tests/auto/widgets/dialogs/qinputdialog/tst_qinputdialog.cpp similarity index 100% rename from tests/auto/qinputdialog/tst_qinputdialog.cpp rename to tests/auto/widgets/dialogs/qinputdialog/tst_qinputdialog.cpp diff --git a/tests/auto/qmessagebox/.gitignore b/tests/auto/widgets/dialogs/qmessagebox/.gitignore similarity index 100% rename from tests/auto/qmessagebox/.gitignore rename to tests/auto/widgets/dialogs/qmessagebox/.gitignore diff --git a/tests/auto/qmessagebox/qmessagebox.pro b/tests/auto/widgets/dialogs/qmessagebox/qmessagebox.pro similarity index 100% rename from tests/auto/qmessagebox/qmessagebox.pro rename to tests/auto/widgets/dialogs/qmessagebox/qmessagebox.pro diff --git a/tests/auto/qmessagebox/tst_qmessagebox.cpp b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp similarity index 100% rename from tests/auto/qmessagebox/tst_qmessagebox.cpp rename to tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp diff --git a/tests/auto/qprogressdialog/.gitignore b/tests/auto/widgets/dialogs/qprogressdialog/.gitignore similarity index 100% rename from tests/auto/qprogressdialog/.gitignore rename to tests/auto/widgets/dialogs/qprogressdialog/.gitignore diff --git a/tests/auto/qprogressdialog/qprogressdialog.pro b/tests/auto/widgets/dialogs/qprogressdialog/qprogressdialog.pro similarity index 100% rename from tests/auto/qprogressdialog/qprogressdialog.pro rename to tests/auto/widgets/dialogs/qprogressdialog/qprogressdialog.pro diff --git a/tests/auto/qprogressdialog/tst_qprogressdialog.cpp b/tests/auto/widgets/dialogs/qprogressdialog/tst_qprogressdialog.cpp similarity index 100% rename from tests/auto/qprogressdialog/tst_qprogressdialog.cpp rename to tests/auto/widgets/dialogs/qprogressdialog/tst_qprogressdialog.cpp diff --git a/tests/auto/qsidebar/.gitignore b/tests/auto/widgets/dialogs/qsidebar/.gitignore similarity index 100% rename from tests/auto/qsidebar/.gitignore rename to tests/auto/widgets/dialogs/qsidebar/.gitignore diff --git a/tests/auto/qsidebar/qsidebar.pro b/tests/auto/widgets/dialogs/qsidebar/qsidebar.pro similarity index 100% rename from tests/auto/qsidebar/qsidebar.pro rename to tests/auto/widgets/dialogs/qsidebar/qsidebar.pro diff --git a/tests/auto/qsidebar/tst_qsidebar.cpp b/tests/auto/widgets/dialogs/qsidebar/tst_qsidebar.cpp similarity index 100% rename from tests/auto/qsidebar/tst_qsidebar.cpp rename to tests/auto/widgets/dialogs/qsidebar/tst_qsidebar.cpp diff --git a/tests/auto/qwizard/.gitignore b/tests/auto/widgets/dialogs/qwizard/.gitignore similarity index 100% rename from tests/auto/qwizard/.gitignore rename to tests/auto/widgets/dialogs/qwizard/.gitignore diff --git a/tests/auto/qwizard/images/background.png b/tests/auto/widgets/dialogs/qwizard/images/background.png similarity index 100% rename from tests/auto/qwizard/images/background.png rename to tests/auto/widgets/dialogs/qwizard/images/background.png diff --git a/tests/auto/qwizard/images/banner.png b/tests/auto/widgets/dialogs/qwizard/images/banner.png similarity index 100% rename from tests/auto/qwizard/images/banner.png rename to tests/auto/widgets/dialogs/qwizard/images/banner.png diff --git a/tests/auto/qwizard/images/logo.png b/tests/auto/widgets/dialogs/qwizard/images/logo.png similarity index 100% rename from tests/auto/qwizard/images/logo.png rename to tests/auto/widgets/dialogs/qwizard/images/logo.png diff --git a/tests/auto/qwizard/images/watermark.png b/tests/auto/widgets/dialogs/qwizard/images/watermark.png similarity index 100% rename from tests/auto/qwizard/images/watermark.png rename to tests/auto/widgets/dialogs/qwizard/images/watermark.png diff --git a/tests/auto/qwizard/qwizard.pro b/tests/auto/widgets/dialogs/qwizard/qwizard.pro similarity index 100% rename from tests/auto/qwizard/qwizard.pro rename to tests/auto/widgets/dialogs/qwizard/qwizard.pro diff --git a/tests/auto/qwizard/qwizard.qrc b/tests/auto/widgets/dialogs/qwizard/qwizard.qrc similarity index 100% rename from tests/auto/qwizard/qwizard.qrc rename to tests/auto/widgets/dialogs/qwizard/qwizard.qrc diff --git a/tests/auto/qwizard/tst_qwizard.cpp b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp similarity index 100% rename from tests/auto/qwizard/tst_qwizard.cpp rename to tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp diff --git a/tests/auto/widgets/effects/effects.pro b/tests/auto/widgets/effects/effects.pro new file mode 100644 index 00000000000..fab24d6296e --- /dev/null +++ b/tests/auto/widgets/effects/effects.pro @@ -0,0 +1,4 @@ +TEMPLATE=subdirs +SUBDIRS=\ + qgraphicseffect \ + diff --git a/tests/auto/qgraphicseffect/qgraphicseffect.pro b/tests/auto/widgets/effects/qgraphicseffect/qgraphicseffect.pro similarity index 100% rename from tests/auto/qgraphicseffect/qgraphicseffect.pro rename to tests/auto/widgets/effects/qgraphicseffect/qgraphicseffect.pro diff --git a/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp b/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp similarity index 99% rename from tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp rename to tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp index e72dd456678..2d9d87a2c54 100644 --- a/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp +++ b/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp @@ -50,7 +50,7 @@ #include #include -#include "../platformquirks.h" +#include "../../../platformquirks.h" //TESTED_CLASS= //TESTED_FILES= diff --git a/tests/auto/widgets/graphicsview/graphicsview.pro b/tests/auto/widgets/graphicsview/graphicsview.pro new file mode 100644 index 00000000000..9955e45b64a --- /dev/null +++ b/tests/auto/widgets/graphicsview/graphicsview.pro @@ -0,0 +1,32 @@ +TEMPLATE=subdirs +SUBDIRS=\ + qgraphicsanchorlayout \ + qgraphicsanchorlayout1 \ + qgraphicseffectsource \ + qgraphicsgridlayout \ + qgraphicsitem \ + qgraphicsitemanimation \ + qgraphicslayout \ + qgraphicslayoutitem \ + qgraphicslinearlayout \ + qgraphicsobject \ + qgraphicspixmapitem \ + qgraphicspolygonitem \ + qgraphicsproxywidget \ + qgraphicsscene \ + qgraphicssceneindex \ + qgraphicstransform \ + qgraphicsview \ + qgraphicswidget \ + +!contains(QT_CONFIG, private_tests): SUBDIRS -= \ + qgraphicsanchorlayout \ + qgraphicsanchorlayout1 \ + qgraphicsitem \ + qgraphicsscene \ + qgraphicssceneindex \ + +# These tests require the cleanlooks style +!contains(styles, cleanlooks):SUBDIRS -= \ + qgraphicsproxywidget \ + qgraphicswidget \ diff --git a/tests/auto/qgraphicsanchorlayout/qgraphicsanchorlayout.pro b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro similarity index 100% rename from tests/auto/qgraphicsanchorlayout/qgraphicsanchorlayout.pro rename to tests/auto/widgets/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro diff --git a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp similarity index 100% rename from tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp rename to tests/auto/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp diff --git a/tests/auto/qgraphicsanchorlayout1/qgraphicsanchorlayout1.pro b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/qgraphicsanchorlayout1.pro similarity index 100% rename from tests/auto/qgraphicsanchorlayout1/qgraphicsanchorlayout1.pro rename to tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/qgraphicsanchorlayout1.pro diff --git a/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp similarity index 100% rename from tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp rename to tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp diff --git a/tests/auto/qgraphicseffectsource/qgraphicseffectsource.pro b/tests/auto/widgets/graphicsview/qgraphicseffectsource/qgraphicseffectsource.pro similarity index 100% rename from tests/auto/qgraphicseffectsource/qgraphicseffectsource.pro rename to tests/auto/widgets/graphicsview/qgraphicseffectsource/qgraphicseffectsource.pro diff --git a/tests/auto/qgraphicseffectsource/tst_qgraphicseffectsource.cpp b/tests/auto/widgets/graphicsview/qgraphicseffectsource/tst_qgraphicseffectsource.cpp similarity index 100% rename from tests/auto/qgraphicseffectsource/tst_qgraphicseffectsource.cpp rename to tests/auto/widgets/graphicsview/qgraphicseffectsource/tst_qgraphicseffectsource.cpp diff --git a/tests/auto/qgraphicsgridlayout/.gitignore b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/.gitignore similarity index 100% rename from tests/auto/qgraphicsgridlayout/.gitignore rename to tests/auto/widgets/graphicsview/qgraphicsgridlayout/.gitignore diff --git a/tests/auto/qgraphicsgridlayout/qgraphicsgridlayout.pro b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/qgraphicsgridlayout.pro similarity index 100% rename from tests/auto/qgraphicsgridlayout/qgraphicsgridlayout.pro rename to tests/auto/widgets/graphicsview/qgraphicsgridlayout/qgraphicsgridlayout.pro diff --git a/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp similarity index 100% rename from tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp rename to tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp diff --git a/tests/auto/qgraphicsitem/.gitignore b/tests/auto/widgets/graphicsview/qgraphicsitem/.gitignore similarity index 100% rename from tests/auto/qgraphicsitem/.gitignore rename to tests/auto/widgets/graphicsview/qgraphicsitem/.gitignore diff --git a/tests/auto/qgraphicsitem/qgraphicsitem.pro b/tests/auto/widgets/graphicsview/qgraphicsitem/qgraphicsitem.pro similarity index 100% rename from tests/auto/qgraphicsitem/qgraphicsitem.pro rename to tests/auto/widgets/graphicsview/qgraphicsitem/qgraphicsitem.pro diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp similarity index 99% rename from tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp rename to tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp index 64824b2048e..8ac1f6b5c59 100644 --- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp @@ -93,7 +93,7 @@ Q_DECLARE_METATYPE(QRectF) #define COMPARE_REGIONS QTRY_COMPARE #endif -#include "../platformquirks.h" +#include "../../../platformquirks.h" static QGraphicsRectItem staticItem; //QTBUG-7629, we should not crash at exit. diff --git a/tests/auto/qgraphicsitemanimation/.gitignore b/tests/auto/widgets/graphicsview/qgraphicsitemanimation/.gitignore similarity index 100% rename from tests/auto/qgraphicsitemanimation/.gitignore rename to tests/auto/widgets/graphicsview/qgraphicsitemanimation/.gitignore diff --git a/tests/auto/qgraphicsitemanimation/qgraphicsitemanimation.pro b/tests/auto/widgets/graphicsview/qgraphicsitemanimation/qgraphicsitemanimation.pro similarity index 100% rename from tests/auto/qgraphicsitemanimation/qgraphicsitemanimation.pro rename to tests/auto/widgets/graphicsview/qgraphicsitemanimation/qgraphicsitemanimation.pro diff --git a/tests/auto/qgraphicsitemanimation/tst_qgraphicsitemanimation.cpp b/tests/auto/widgets/graphicsview/qgraphicsitemanimation/tst_qgraphicsitemanimation.cpp similarity index 100% rename from tests/auto/qgraphicsitemanimation/tst_qgraphicsitemanimation.cpp rename to tests/auto/widgets/graphicsview/qgraphicsitemanimation/tst_qgraphicsitemanimation.cpp diff --git a/tests/auto/qgraphicslayout/.gitignore b/tests/auto/widgets/graphicsview/qgraphicslayout/.gitignore similarity index 100% rename from tests/auto/qgraphicslayout/.gitignore rename to tests/auto/widgets/graphicsview/qgraphicslayout/.gitignore diff --git a/tests/auto/qgraphicslayout/qgraphicslayout.pro b/tests/auto/widgets/graphicsview/qgraphicslayout/qgraphicslayout.pro similarity index 100% rename from tests/auto/qgraphicslayout/qgraphicslayout.pro rename to tests/auto/widgets/graphicsview/qgraphicslayout/qgraphicslayout.pro diff --git a/tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp b/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp similarity index 100% rename from tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp rename to tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp diff --git a/tests/auto/qgraphicslayoutitem/.gitignore b/tests/auto/widgets/graphicsview/qgraphicslayoutitem/.gitignore similarity index 100% rename from tests/auto/qgraphicslayoutitem/.gitignore rename to tests/auto/widgets/graphicsview/qgraphicslayoutitem/.gitignore diff --git a/tests/auto/qgraphicslayoutitem/qgraphicslayoutitem.pro b/tests/auto/widgets/graphicsview/qgraphicslayoutitem/qgraphicslayoutitem.pro similarity index 100% rename from tests/auto/qgraphicslayoutitem/qgraphicslayoutitem.pro rename to tests/auto/widgets/graphicsview/qgraphicslayoutitem/qgraphicslayoutitem.pro diff --git a/tests/auto/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp b/tests/auto/widgets/graphicsview/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp similarity index 100% rename from tests/auto/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp rename to tests/auto/widgets/graphicsview/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp diff --git a/tests/auto/qgraphicslinearlayout/.gitignore b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/.gitignore similarity index 100% rename from tests/auto/qgraphicslinearlayout/.gitignore rename to tests/auto/widgets/graphicsview/qgraphicslinearlayout/.gitignore diff --git a/tests/auto/qgraphicslinearlayout/qgraphicslinearlayout.pro b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/qgraphicslinearlayout.pro similarity index 100% rename from tests/auto/qgraphicslinearlayout/qgraphicslinearlayout.pro rename to tests/auto/widgets/graphicsview/qgraphicslinearlayout/qgraphicslinearlayout.pro diff --git a/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp similarity index 100% rename from tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp rename to tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp diff --git a/tests/auto/qgraphicsobject/qgraphicsobject.pro b/tests/auto/widgets/graphicsview/qgraphicsobject/qgraphicsobject.pro similarity index 100% rename from tests/auto/qgraphicsobject/qgraphicsobject.pro rename to tests/auto/widgets/graphicsview/qgraphicsobject/qgraphicsobject.pro diff --git a/tests/auto/qgraphicsobject/tst_qgraphicsobject.cpp b/tests/auto/widgets/graphicsview/qgraphicsobject/tst_qgraphicsobject.cpp similarity index 100% rename from tests/auto/qgraphicsobject/tst_qgraphicsobject.cpp rename to tests/auto/widgets/graphicsview/qgraphicsobject/tst_qgraphicsobject.cpp diff --git a/tests/auto/qgraphicspixmapitem/.gitignore b/tests/auto/widgets/graphicsview/qgraphicspixmapitem/.gitignore similarity index 100% rename from tests/auto/qgraphicspixmapitem/.gitignore rename to tests/auto/widgets/graphicsview/qgraphicspixmapitem/.gitignore diff --git a/tests/auto/qgraphicspixmapitem/qgraphicspixmapitem.pro b/tests/auto/widgets/graphicsview/qgraphicspixmapitem/qgraphicspixmapitem.pro similarity index 100% rename from tests/auto/qgraphicspixmapitem/qgraphicspixmapitem.pro rename to tests/auto/widgets/graphicsview/qgraphicspixmapitem/qgraphicspixmapitem.pro diff --git a/tests/auto/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp b/tests/auto/widgets/graphicsview/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp similarity index 100% rename from tests/auto/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp rename to tests/auto/widgets/graphicsview/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp diff --git a/tests/auto/qgraphicspolygonitem/.gitignore b/tests/auto/widgets/graphicsview/qgraphicspolygonitem/.gitignore similarity index 100% rename from tests/auto/qgraphicspolygonitem/.gitignore rename to tests/auto/widgets/graphicsview/qgraphicspolygonitem/.gitignore diff --git a/tests/auto/qgraphicspolygonitem/qgraphicspolygonitem.pro b/tests/auto/widgets/graphicsview/qgraphicspolygonitem/qgraphicspolygonitem.pro similarity index 100% rename from tests/auto/qgraphicspolygonitem/qgraphicspolygonitem.pro rename to tests/auto/widgets/graphicsview/qgraphicspolygonitem/qgraphicspolygonitem.pro diff --git a/tests/auto/qgraphicspolygonitem/tst_qgraphicspolygonitem.cpp b/tests/auto/widgets/graphicsview/qgraphicspolygonitem/tst_qgraphicspolygonitem.cpp similarity index 100% rename from tests/auto/qgraphicspolygonitem/tst_qgraphicspolygonitem.cpp rename to tests/auto/widgets/graphicsview/qgraphicspolygonitem/tst_qgraphicspolygonitem.cpp diff --git a/tests/auto/qgraphicsproxywidget/.gitignore b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/.gitignore similarity index 100% rename from tests/auto/qgraphicsproxywidget/.gitignore rename to tests/auto/widgets/graphicsview/qgraphicsproxywidget/.gitignore diff --git a/tests/auto/qgraphicsproxywidget/qgraphicsproxywidget.pro b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/qgraphicsproxywidget.pro similarity index 100% rename from tests/auto/qgraphicsproxywidget/qgraphicsproxywidget.pro rename to tests/auto/widgets/graphicsview/qgraphicsproxywidget/qgraphicsproxywidget.pro diff --git a/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp similarity index 100% rename from tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp rename to tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp diff --git a/tests/auto/qgraphicsscene/.gitignore b/tests/auto/widgets/graphicsview/qgraphicsscene/.gitignore similarity index 100% rename from tests/auto/qgraphicsscene/.gitignore rename to tests/auto/widgets/graphicsview/qgraphicsscene/.gitignore diff --git a/tests/auto/qgraphicsscene/Ash_European.jpg b/tests/auto/widgets/graphicsview/qgraphicsscene/Ash_European.jpg similarity index 100% rename from tests/auto/qgraphicsscene/Ash_European.jpg rename to tests/auto/widgets/graphicsview/qgraphicsscene/Ash_European.jpg diff --git a/tests/auto/qgraphicsscene/graphicsScene_selection.data b/tests/auto/widgets/graphicsview/qgraphicsscene/graphicsScene_selection.data similarity index 100% rename from tests/auto/qgraphicsscene/graphicsScene_selection.data rename to tests/auto/widgets/graphicsview/qgraphicsscene/graphicsScene_selection.data diff --git a/tests/auto/qgraphicsscene/images.qrc b/tests/auto/widgets/graphicsview/qgraphicsscene/images.qrc similarity index 100% rename from tests/auto/qgraphicsscene/images.qrc rename to tests/auto/widgets/graphicsview/qgraphicsscene/images.qrc diff --git a/tests/auto/qgraphicsscene/qgraphicsscene.pro b/tests/auto/widgets/graphicsview/qgraphicsscene/qgraphicsscene.pro similarity index 100% rename from tests/auto/qgraphicsscene/qgraphicsscene.pro rename to tests/auto/widgets/graphicsview/qgraphicsscene/qgraphicsscene.pro diff --git a/tests/auto/qgraphicsscene/testData/render/all-all-45-deg-left.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-all-45-deg-left.png similarity index 100% rename from tests/auto/qgraphicsscene/testData/render/all-all-45-deg-left.png rename to tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-all-45-deg-left.png diff --git a/tests/auto/qgraphicsscene/testData/render/all-all-45-deg-right.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-all-45-deg-right.png similarity index 100% rename from tests/auto/qgraphicsscene/testData/render/all-all-45-deg-right.png rename to tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-all-45-deg-right.png diff --git a/tests/auto/qgraphicsscene/testData/render/all-all-scale-2x.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-all-scale-2x.png similarity index 100% rename from tests/auto/qgraphicsscene/testData/render/all-all-scale-2x.png rename to tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-all-scale-2x.png diff --git a/tests/auto/qgraphicsscene/testData/render/all-all-translate-0-50.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-all-translate-0-50.png similarity index 100% rename from tests/auto/qgraphicsscene/testData/render/all-all-translate-0-50.png rename to tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-all-translate-0-50.png diff --git a/tests/auto/qgraphicsscene/testData/render/all-all-translate-50-0.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-all-translate-50-0.png similarity index 100% rename from tests/auto/qgraphicsscene/testData/render/all-all-translate-50-0.png rename to tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-all-translate-50-0.png diff --git a/tests/auto/qgraphicsscene/testData/render/all-all-untransformed-clip-ellipse.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-all-untransformed-clip-ellipse.png similarity index 100% rename from tests/auto/qgraphicsscene/testData/render/all-all-untransformed-clip-ellipse.png rename to tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-all-untransformed-clip-ellipse.png diff --git a/tests/auto/qgraphicsscene/testData/render/all-all-untransformed-clip-rect.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-all-untransformed-clip-rect.png similarity index 100% rename from tests/auto/qgraphicsscene/testData/render/all-all-untransformed-clip-rect.png rename to tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-all-untransformed-clip-rect.png diff --git a/tests/auto/qgraphicsscene/testData/render/all-all-untransformed.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-all-untransformed.png similarity index 100% rename from tests/auto/qgraphicsscene/testData/render/all-all-untransformed.png rename to tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-all-untransformed.png diff --git a/tests/auto/qgraphicsscene/testData/render/all-bottomleft-untransformed.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-bottomleft-untransformed.png similarity index 100% rename from tests/auto/qgraphicsscene/testData/render/all-bottomleft-untransformed.png rename to tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-bottomleft-untransformed.png diff --git a/tests/auto/qgraphicsscene/testData/render/all-bottomright-untransformed.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-bottomright-untransformed.png similarity index 100% rename from tests/auto/qgraphicsscene/testData/render/all-bottomright-untransformed.png rename to tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-bottomright-untransformed.png diff --git a/tests/auto/qgraphicsscene/testData/render/all-topleft-untransformed.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-topleft-untransformed.png similarity index 100% rename from tests/auto/qgraphicsscene/testData/render/all-topleft-untransformed.png rename to tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-topleft-untransformed.png diff --git a/tests/auto/qgraphicsscene/testData/render/all-topright-untransformed.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-topright-untransformed.png similarity index 100% rename from tests/auto/qgraphicsscene/testData/render/all-topright-untransformed.png rename to tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-topright-untransformed.png diff --git a/tests/auto/qgraphicsscene/testData/render/bottom-bottomright-untransformed.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/bottom-bottomright-untransformed.png similarity index 100% rename from tests/auto/qgraphicsscene/testData/render/bottom-bottomright-untransformed.png rename to tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/bottom-bottomright-untransformed.png diff --git a/tests/auto/qgraphicsscene/testData/render/bottom-topleft-untransformed.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/bottom-topleft-untransformed.png similarity index 100% rename from tests/auto/qgraphicsscene/testData/render/bottom-topleft-untransformed.png rename to tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/bottom-topleft-untransformed.png diff --git a/tests/auto/qgraphicsscene/testData/render/bottomleft-all-untransformed.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/bottomleft-all-untransformed.png similarity index 100% rename from tests/auto/qgraphicsscene/testData/render/bottomleft-all-untransformed.png rename to tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/bottomleft-all-untransformed.png diff --git a/tests/auto/qgraphicsscene/testData/render/bottomleft-topleft-untransformed.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/bottomleft-topleft-untransformed.png similarity index 100% rename from tests/auto/qgraphicsscene/testData/render/bottomleft-topleft-untransformed.png rename to tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/bottomleft-topleft-untransformed.png diff --git a/tests/auto/qgraphicsscene/testData/render/bottomright-all-untransformed.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/bottomright-all-untransformed.png similarity index 100% rename from tests/auto/qgraphicsscene/testData/render/bottomright-all-untransformed.png rename to tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/bottomright-all-untransformed.png diff --git a/tests/auto/qgraphicsscene/testData/render/bottomright-topleft-untransformed.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/bottomright-topleft-untransformed.png similarity index 100% rename from tests/auto/qgraphicsscene/testData/render/bottomright-topleft-untransformed.png rename to tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/bottomright-topleft-untransformed.png diff --git a/tests/auto/qgraphicsscene/testData/render/left-bottomright-untransformed.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/left-bottomright-untransformed.png similarity index 100% rename from tests/auto/qgraphicsscene/testData/render/left-bottomright-untransformed.png rename to tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/left-bottomright-untransformed.png diff --git a/tests/auto/qgraphicsscene/testData/render/left-topleft-untransformed.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/left-topleft-untransformed.png similarity index 100% rename from tests/auto/qgraphicsscene/testData/render/left-topleft-untransformed.png rename to tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/left-topleft-untransformed.png diff --git a/tests/auto/qgraphicsscene/testData/render/right-bottomright-untransformed.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/right-bottomright-untransformed.png similarity index 100% rename from tests/auto/qgraphicsscene/testData/render/right-bottomright-untransformed.png rename to tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/right-bottomright-untransformed.png diff --git a/tests/auto/qgraphicsscene/testData/render/right-topleft-untransformed.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/right-topleft-untransformed.png similarity index 100% rename from tests/auto/qgraphicsscene/testData/render/right-topleft-untransformed.png rename to tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/right-topleft-untransformed.png diff --git a/tests/auto/qgraphicsscene/testData/render/top-bottomright-untransformed.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/top-bottomright-untransformed.png similarity index 100% rename from tests/auto/qgraphicsscene/testData/render/top-bottomright-untransformed.png rename to tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/top-bottomright-untransformed.png diff --git a/tests/auto/qgraphicsscene/testData/render/top-topleft-untransformed.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/top-topleft-untransformed.png similarity index 100% rename from tests/auto/qgraphicsscene/testData/render/top-topleft-untransformed.png rename to tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/top-topleft-untransformed.png diff --git a/tests/auto/qgraphicsscene/testData/render/topleft-all-untransformed.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/topleft-all-untransformed.png similarity index 100% rename from tests/auto/qgraphicsscene/testData/render/topleft-all-untransformed.png rename to tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/topleft-all-untransformed.png diff --git a/tests/auto/qgraphicsscene/testData/render/topleft-topleft-untransformed.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/topleft-topleft-untransformed.png similarity index 100% rename from tests/auto/qgraphicsscene/testData/render/topleft-topleft-untransformed.png rename to tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/topleft-topleft-untransformed.png diff --git a/tests/auto/qgraphicsscene/testData/render/topright-all-untransformed.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/topright-all-untransformed.png similarity index 100% rename from tests/auto/qgraphicsscene/testData/render/topright-all-untransformed.png rename to tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/topright-all-untransformed.png diff --git a/tests/auto/qgraphicsscene/testData/render/topright-topleft-untransformed.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/topright-topleft-untransformed.png similarity index 100% rename from tests/auto/qgraphicsscene/testData/render/topright-topleft-untransformed.png rename to tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/topright-topleft-untransformed.png diff --git a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp similarity index 99% rename from tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp rename to tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp index 0a345730393..9ac1573b2a8 100644 --- a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp @@ -50,7 +50,7 @@ #include #include #include -#include "../gui/painting/qpathclipper/pathcompare.h" +#include "../../../gui/painting/qpathclipper/pathcompare.h" #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) #include diff --git a/tests/auto/qgraphicssceneindex/qgraphicssceneindex.pro b/tests/auto/widgets/graphicsview/qgraphicssceneindex/qgraphicssceneindex.pro similarity index 100% rename from tests/auto/qgraphicssceneindex/qgraphicssceneindex.pro rename to tests/auto/widgets/graphicsview/qgraphicssceneindex/qgraphicssceneindex.pro diff --git a/tests/auto/qgraphicssceneindex/tst_qgraphicssceneindex.cpp b/tests/auto/widgets/graphicsview/qgraphicssceneindex/tst_qgraphicssceneindex.cpp similarity index 100% rename from tests/auto/qgraphicssceneindex/tst_qgraphicssceneindex.cpp rename to tests/auto/widgets/graphicsview/qgraphicssceneindex/tst_qgraphicssceneindex.cpp diff --git a/tests/auto/qgraphicstransform/qgraphicstransform.pro b/tests/auto/widgets/graphicsview/qgraphicstransform/qgraphicstransform.pro similarity index 100% rename from tests/auto/qgraphicstransform/qgraphicstransform.pro rename to tests/auto/widgets/graphicsview/qgraphicstransform/qgraphicstransform.pro diff --git a/tests/auto/qgraphicstransform/tst_qgraphicstransform.cpp b/tests/auto/widgets/graphicsview/qgraphicstransform/tst_qgraphicstransform.cpp similarity index 100% rename from tests/auto/qgraphicstransform/tst_qgraphicstransform.cpp rename to tests/auto/widgets/graphicsview/qgraphicstransform/tst_qgraphicstransform.cpp diff --git a/tests/auto/qgraphicsview/.gitignore b/tests/auto/widgets/graphicsview/qgraphicsview/.gitignore similarity index 100% rename from tests/auto/qgraphicsview/.gitignore rename to tests/auto/widgets/graphicsview/qgraphicsview/.gitignore diff --git a/tests/auto/qgraphicsview/qgraphicsview.pro b/tests/auto/widgets/graphicsview/qgraphicsview/qgraphicsview.pro similarity index 100% rename from tests/auto/qgraphicsview/qgraphicsview.pro rename to tests/auto/widgets/graphicsview/qgraphicsview/qgraphicsview.pro diff --git a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp similarity index 99% rename from tests/auto/qgraphicsview/tst_qgraphicsview.cpp rename to tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp index 444e15a7883..0a404cab464 100644 --- a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp @@ -71,7 +71,7 @@ #include #include #include -#include "../platformquirks.h" +#include "../../../platformquirks.h" //TESTED_CLASS= //TESTED_FILES= diff --git a/tests/auto/qgraphicsview/tst_qgraphicsview_2.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview_2.cpp similarity index 100% rename from tests/auto/qgraphicsview/tst_qgraphicsview_2.cpp rename to tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview_2.cpp diff --git a/tests/auto/qgraphicswidget/.gitignore b/tests/auto/widgets/graphicsview/qgraphicswidget/.gitignore similarity index 100% rename from tests/auto/qgraphicswidget/.gitignore rename to tests/auto/widgets/graphicsview/qgraphicswidget/.gitignore diff --git a/tests/auto/qgraphicswidget/qgraphicswidget.pro b/tests/auto/widgets/graphicsview/qgraphicswidget/qgraphicswidget.pro similarity index 100% rename from tests/auto/qgraphicswidget/qgraphicswidget.pro rename to tests/auto/widgets/graphicsview/qgraphicswidget/qgraphicswidget.pro diff --git a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp similarity index 99% rename from tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp rename to tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp index e3eb05ca1a8..c983016a20c 100644 --- a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp @@ -52,7 +52,7 @@ #include #include #include -#include "../platformquirks.h" +#include "../../../platformquirks.h" class EventSpy : public QObject diff --git a/tests/auto/widgets/itemviews/itemviews.pro b/tests/auto/widgets/itemviews/itemviews.pro new file mode 100644 index 00000000000..fc338fdb7b2 --- /dev/null +++ b/tests/auto/widgets/itemviews/itemviews.pro @@ -0,0 +1,33 @@ +TEMPLATE=subdirs +SUBDIRS=\ + qabstractitemview \ + qabstractproxymodel \ + qcolumnview \ + qdatawidgetmapper \ + qdirmodel \ + qfileiconprovider \ + qheaderview \ + qidentityproxymodel \ + qitemdelegate \ + qitemeditorfactory \ + qitemselectionmodel \ + qitemview \ + qlistview \ + qlistwidget \ + qsortfilterproxymodel \ + qstandarditem \ + qstandarditemmodel \ + qstringlistmodel \ + qtableview \ + qtablewidget \ + qtreeview \ + qtreewidget \ + qtreewidgetitemiterator \ + +!contains(QT_CONFIG, private_tests): SUBDIRS -= \ + qcolumnview \ + qlistwidget \ + +# This test takes too long to run on IRIX, so skip it on that platform +irix-*:SUBDIRS -= qitemview + diff --git a/tests/auto/qabstractitemview/.gitignore b/tests/auto/widgets/itemviews/qabstractitemview/.gitignore similarity index 100% rename from tests/auto/qabstractitemview/.gitignore rename to tests/auto/widgets/itemviews/qabstractitemview/.gitignore diff --git a/tests/auto/qabstractitemview/qabstractitemview.pro b/tests/auto/widgets/itemviews/qabstractitemview/qabstractitemview.pro similarity index 100% rename from tests/auto/qabstractitemview/qabstractitemview.pro rename to tests/auto/widgets/itemviews/qabstractitemview/qabstractitemview.pro diff --git a/tests/auto/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp similarity index 100% rename from tests/auto/qabstractitemview/tst_qabstractitemview.cpp rename to tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp diff --git a/tests/auto/qabstractproxymodel/.gitignore b/tests/auto/widgets/itemviews/qabstractproxymodel/.gitignore similarity index 100% rename from tests/auto/qabstractproxymodel/.gitignore rename to tests/auto/widgets/itemviews/qabstractproxymodel/.gitignore diff --git a/tests/auto/qabstractproxymodel/qabstractproxymodel.pro b/tests/auto/widgets/itemviews/qabstractproxymodel/qabstractproxymodel.pro similarity index 100% rename from tests/auto/qabstractproxymodel/qabstractproxymodel.pro rename to tests/auto/widgets/itemviews/qabstractproxymodel/qabstractproxymodel.pro diff --git a/tests/auto/qabstractproxymodel/tst_qabstractproxymodel.cpp b/tests/auto/widgets/itemviews/qabstractproxymodel/tst_qabstractproxymodel.cpp similarity index 100% rename from tests/auto/qabstractproxymodel/tst_qabstractproxymodel.cpp rename to tests/auto/widgets/itemviews/qabstractproxymodel/tst_qabstractproxymodel.cpp diff --git a/tests/auto/qcolumnview/.gitignore b/tests/auto/widgets/itemviews/qcolumnview/.gitignore similarity index 100% rename from tests/auto/qcolumnview/.gitignore rename to tests/auto/widgets/itemviews/qcolumnview/.gitignore diff --git a/tests/auto/qcolumnview/qcolumnview.pro b/tests/auto/widgets/itemviews/qcolumnview/qcolumnview.pro similarity index 100% rename from tests/auto/qcolumnview/qcolumnview.pro rename to tests/auto/widgets/itemviews/qcolumnview/qcolumnview.pro diff --git a/tests/auto/qcolumnview/tst_qcolumnview.cpp b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp similarity index 100% rename from tests/auto/qcolumnview/tst_qcolumnview.cpp rename to tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp diff --git a/tests/auto/qdatawidgetmapper/.gitignore b/tests/auto/widgets/itemviews/qdatawidgetmapper/.gitignore similarity index 100% rename from tests/auto/qdatawidgetmapper/.gitignore rename to tests/auto/widgets/itemviews/qdatawidgetmapper/.gitignore diff --git a/tests/auto/qdatawidgetmapper/qdatawidgetmapper.pro b/tests/auto/widgets/itemviews/qdatawidgetmapper/qdatawidgetmapper.pro similarity index 100% rename from tests/auto/qdatawidgetmapper/qdatawidgetmapper.pro rename to tests/auto/widgets/itemviews/qdatawidgetmapper/qdatawidgetmapper.pro diff --git a/tests/auto/qdatawidgetmapper/tst_qdatawidgetmapper.cpp b/tests/auto/widgets/itemviews/qdatawidgetmapper/tst_qdatawidgetmapper.cpp similarity index 100% rename from tests/auto/qdatawidgetmapper/tst_qdatawidgetmapper.cpp rename to tests/auto/widgets/itemviews/qdatawidgetmapper/tst_qdatawidgetmapper.cpp diff --git a/tests/auto/qdirmodel/.gitignore b/tests/auto/widgets/itemviews/qdirmodel/.gitignore similarity index 100% rename from tests/auto/qdirmodel/.gitignore rename to tests/auto/widgets/itemviews/qdirmodel/.gitignore diff --git a/tests/auto/qdirmodel/dirtest/test1/dummy b/tests/auto/widgets/itemviews/qdirmodel/dirtest/test1/dummy similarity index 100% rename from tests/auto/qdirmodel/dirtest/test1/dummy rename to tests/auto/widgets/itemviews/qdirmodel/dirtest/test1/dummy diff --git a/tests/auto/qdirmodel/dirtest/test1/test b/tests/auto/widgets/itemviews/qdirmodel/dirtest/test1/test similarity index 100% rename from tests/auto/qdirmodel/dirtest/test1/test rename to tests/auto/widgets/itemviews/qdirmodel/dirtest/test1/test diff --git a/tests/auto/qdirmodel/qdirmodel.pro b/tests/auto/widgets/itemviews/qdirmodel/qdirmodel.pro similarity index 100% rename from tests/auto/qdirmodel/qdirmodel.pro rename to tests/auto/widgets/itemviews/qdirmodel/qdirmodel.pro diff --git a/tests/auto/qdirmodel/test/file01.tst b/tests/auto/widgets/itemviews/qdirmodel/test/file01.tst similarity index 100% rename from tests/auto/qdirmodel/test/file01.tst rename to tests/auto/widgets/itemviews/qdirmodel/test/file01.tst diff --git a/tests/auto/qdirmodel/test/file02.tst b/tests/auto/widgets/itemviews/qdirmodel/test/file02.tst similarity index 100% rename from tests/auto/qdirmodel/test/file02.tst rename to tests/auto/widgets/itemviews/qdirmodel/test/file02.tst diff --git a/tests/auto/qdirmodel/test/file03.tst b/tests/auto/widgets/itemviews/qdirmodel/test/file03.tst similarity index 100% rename from tests/auto/qdirmodel/test/file03.tst rename to tests/auto/widgets/itemviews/qdirmodel/test/file03.tst diff --git a/tests/auto/qdirmodel/test/file04.tst b/tests/auto/widgets/itemviews/qdirmodel/test/file04.tst similarity index 100% rename from tests/auto/qdirmodel/test/file04.tst rename to tests/auto/widgets/itemviews/qdirmodel/test/file04.tst diff --git a/tests/auto/qdirmodel/tst_qdirmodel.cpp b/tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp similarity index 100% rename from tests/auto/qdirmodel/tst_qdirmodel.cpp rename to tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp diff --git a/tests/auto/qfileiconprovider/.gitignore b/tests/auto/widgets/itemviews/qfileiconprovider/.gitignore similarity index 100% rename from tests/auto/qfileiconprovider/.gitignore rename to tests/auto/widgets/itemviews/qfileiconprovider/.gitignore diff --git a/tests/auto/qfileiconprovider/qfileiconprovider.pro b/tests/auto/widgets/itemviews/qfileiconprovider/qfileiconprovider.pro similarity index 100% rename from tests/auto/qfileiconprovider/qfileiconprovider.pro rename to tests/auto/widgets/itemviews/qfileiconprovider/qfileiconprovider.pro diff --git a/tests/auto/qfileiconprovider/tst_qfileiconprovider.cpp b/tests/auto/widgets/itemviews/qfileiconprovider/tst_qfileiconprovider.cpp similarity index 100% rename from tests/auto/qfileiconprovider/tst_qfileiconprovider.cpp rename to tests/auto/widgets/itemviews/qfileiconprovider/tst_qfileiconprovider.cpp diff --git a/tests/auto/qheaderview/.gitignore b/tests/auto/widgets/itemviews/qheaderview/.gitignore similarity index 100% rename from tests/auto/qheaderview/.gitignore rename to tests/auto/widgets/itemviews/qheaderview/.gitignore diff --git a/tests/auto/qheaderview/qheaderview.pro b/tests/auto/widgets/itemviews/qheaderview/qheaderview.pro similarity index 100% rename from tests/auto/qheaderview/qheaderview.pro rename to tests/auto/widgets/itemviews/qheaderview/qheaderview.pro diff --git a/tests/auto/qheaderview/tst_qheaderview.cpp b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp similarity index 100% rename from tests/auto/qheaderview/tst_qheaderview.cpp rename to tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp diff --git a/tests/auto/widgets/itemviews/qidentityproxymodel/qidentityproxymodel.pro b/tests/auto/widgets/itemviews/qidentityproxymodel/qidentityproxymodel.pro new file mode 100644 index 00000000000..141e72a8c0d --- /dev/null +++ b/tests/auto/widgets/itemviews/qidentityproxymodel/qidentityproxymodel.pro @@ -0,0 +1,7 @@ +load(qttest_p4) + +mtdir = ../../../integrationtests/modeltest +INCLUDEPATH += $$PWD/$${mtdir} +QT += widgets +SOURCES += tst_qidentityproxymodel.cpp $${mtdir}/dynamictreemodel.cpp $${mtdir}/modeltest.cpp +HEADERS += $${mtdir}/dynamictreemodel.h $${mtdir}/modeltest.h diff --git a/tests/auto/qidentityproxymodel/tst_qidentityproxymodel.cpp b/tests/auto/widgets/itemviews/qidentityproxymodel/tst_qidentityproxymodel.cpp similarity index 100% rename from tests/auto/qidentityproxymodel/tst_qidentityproxymodel.cpp rename to tests/auto/widgets/itemviews/qidentityproxymodel/tst_qidentityproxymodel.cpp diff --git a/tests/auto/qitemdelegate/.gitignore b/tests/auto/widgets/itemviews/qitemdelegate/.gitignore similarity index 100% rename from tests/auto/qitemdelegate/.gitignore rename to tests/auto/widgets/itemviews/qitemdelegate/.gitignore diff --git a/tests/auto/qitemdelegate/qitemdelegate.pro b/tests/auto/widgets/itemviews/qitemdelegate/qitemdelegate.pro similarity index 100% rename from tests/auto/qitemdelegate/qitemdelegate.pro rename to tests/auto/widgets/itemviews/qitemdelegate/qitemdelegate.pro diff --git a/tests/auto/qitemdelegate/tst_qitemdelegate.cpp b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp similarity index 100% rename from tests/auto/qitemdelegate/tst_qitemdelegate.cpp rename to tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp diff --git a/tests/auto/qitemeditorfactory/.gitignore b/tests/auto/widgets/itemviews/qitemeditorfactory/.gitignore similarity index 100% rename from tests/auto/qitemeditorfactory/.gitignore rename to tests/auto/widgets/itemviews/qitemeditorfactory/.gitignore diff --git a/tests/auto/qitemeditorfactory/qitemeditorfactory.pro b/tests/auto/widgets/itemviews/qitemeditorfactory/qitemeditorfactory.pro similarity index 100% rename from tests/auto/qitemeditorfactory/qitemeditorfactory.pro rename to tests/auto/widgets/itemviews/qitemeditorfactory/qitemeditorfactory.pro diff --git a/tests/auto/qitemeditorfactory/tst_qitemeditorfactory.cpp b/tests/auto/widgets/itemviews/qitemeditorfactory/tst_qitemeditorfactory.cpp similarity index 100% rename from tests/auto/qitemeditorfactory/tst_qitemeditorfactory.cpp rename to tests/auto/widgets/itemviews/qitemeditorfactory/tst_qitemeditorfactory.cpp diff --git a/tests/auto/qitemselectionmodel/.gitignore b/tests/auto/widgets/itemviews/qitemselectionmodel/.gitignore similarity index 100% rename from tests/auto/qitemselectionmodel/.gitignore rename to tests/auto/widgets/itemviews/qitemselectionmodel/.gitignore diff --git a/tests/auto/qitemselectionmodel/qitemselectionmodel.pro b/tests/auto/widgets/itemviews/qitemselectionmodel/qitemselectionmodel.pro similarity index 100% rename from tests/auto/qitemselectionmodel/qitemselectionmodel.pro rename to tests/auto/widgets/itemviews/qitemselectionmodel/qitemselectionmodel.pro diff --git a/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp b/tests/auto/widgets/itemviews/qitemselectionmodel/tst_qitemselectionmodel.cpp similarity index 100% rename from tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp rename to tests/auto/widgets/itemviews/qitemselectionmodel/tst_qitemselectionmodel.cpp diff --git a/tests/auto/qitemview/.gitignore b/tests/auto/widgets/itemviews/qitemview/.gitignore similarity index 100% rename from tests/auto/qitemview/.gitignore rename to tests/auto/widgets/itemviews/qitemview/.gitignore diff --git a/tests/auto/qitemview/qitemview.pro b/tests/auto/widgets/itemviews/qitemview/qitemview.pro similarity index 100% rename from tests/auto/qitemview/qitemview.pro rename to tests/auto/widgets/itemviews/qitemview/qitemview.pro diff --git a/tests/auto/qitemview/tst_qitemview.cpp b/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp similarity index 100% rename from tests/auto/qitemview/tst_qitemview.cpp rename to tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp diff --git a/tests/auto/qitemview/viewstotest.cpp b/tests/auto/widgets/itemviews/qitemview/viewstotest.cpp similarity index 100% rename from tests/auto/qitemview/viewstotest.cpp rename to tests/auto/widgets/itemviews/qitemview/viewstotest.cpp diff --git a/tests/auto/qlistview/.gitignore b/tests/auto/widgets/itemviews/qlistview/.gitignore similarity index 100% rename from tests/auto/qlistview/.gitignore rename to tests/auto/widgets/itemviews/qlistview/.gitignore diff --git a/tests/auto/qlistview/qlistview.pro b/tests/auto/widgets/itemviews/qlistview/qlistview.pro similarity index 100% rename from tests/auto/qlistview/qlistview.pro rename to tests/auto/widgets/itemviews/qlistview/qlistview.pro diff --git a/tests/auto/qlistview/tst_qlistview.cpp b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp similarity index 100% rename from tests/auto/qlistview/tst_qlistview.cpp rename to tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp diff --git a/tests/auto/qlistwidget/.gitignore b/tests/auto/widgets/itemviews/qlistwidget/.gitignore similarity index 100% rename from tests/auto/qlistwidget/.gitignore rename to tests/auto/widgets/itemviews/qlistwidget/.gitignore diff --git a/tests/auto/qlistwidget/qlistwidget.pro b/tests/auto/widgets/itemviews/qlistwidget/qlistwidget.pro similarity index 100% rename from tests/auto/qlistwidget/qlistwidget.pro rename to tests/auto/widgets/itemviews/qlistwidget/qlistwidget.pro diff --git a/tests/auto/qlistwidget/tst_qlistwidget.cpp b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp similarity index 100% rename from tests/auto/qlistwidget/tst_qlistwidget.cpp rename to tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp diff --git a/tests/auto/qsortfilterproxymodel/.gitignore b/tests/auto/widgets/itemviews/qsortfilterproxymodel/.gitignore similarity index 100% rename from tests/auto/qsortfilterproxymodel/.gitignore rename to tests/auto/widgets/itemviews/qsortfilterproxymodel/.gitignore diff --git a/tests/auto/widgets/itemviews/qsortfilterproxymodel/qsortfilterproxymodel.pro b/tests/auto/widgets/itemviews/qsortfilterproxymodel/qsortfilterproxymodel.pro new file mode 100644 index 00000000000..65207b6563d --- /dev/null +++ b/tests/auto/widgets/itemviews/qsortfilterproxymodel/qsortfilterproxymodel.pro @@ -0,0 +1,8 @@ +load(qttest_p4) + +QT += gui widgets +mtdir = ../../../integrationtests/modeltest + +INCLUDEPATH += $$PWD/$${mtdir} +SOURCES += tst_qsortfilterproxymodel.cpp $${mtdir}/dynamictreemodel.cpp $${mtdir}/modeltest.cpp +HEADERS += $${mtdir}/dynamictreemodel.h $${mtdir}/modeltest.h diff --git a/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp b/tests/auto/widgets/itemviews/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp similarity index 100% rename from tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp rename to tests/auto/widgets/itemviews/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp diff --git a/tests/auto/qstandarditem/.gitignore b/tests/auto/widgets/itemviews/qstandarditem/.gitignore similarity index 100% rename from tests/auto/qstandarditem/.gitignore rename to tests/auto/widgets/itemviews/qstandarditem/.gitignore diff --git a/tests/auto/qstandarditem/qstandarditem.pro b/tests/auto/widgets/itemviews/qstandarditem/qstandarditem.pro similarity index 100% rename from tests/auto/qstandarditem/qstandarditem.pro rename to tests/auto/widgets/itemviews/qstandarditem/qstandarditem.pro diff --git a/tests/auto/qstandarditem/tst_qstandarditem.cpp b/tests/auto/widgets/itemviews/qstandarditem/tst_qstandarditem.cpp similarity index 100% rename from tests/auto/qstandarditem/tst_qstandarditem.cpp rename to tests/auto/widgets/itemviews/qstandarditem/tst_qstandarditem.cpp diff --git a/tests/auto/qstandarditemmodel/.gitignore b/tests/auto/widgets/itemviews/qstandarditemmodel/.gitignore similarity index 100% rename from tests/auto/qstandarditemmodel/.gitignore rename to tests/auto/widgets/itemviews/qstandarditemmodel/.gitignore diff --git a/tests/auto/qstandarditemmodel/qstandarditemmodel.pro b/tests/auto/widgets/itemviews/qstandarditemmodel/qstandarditemmodel.pro similarity index 100% rename from tests/auto/qstandarditemmodel/qstandarditemmodel.pro rename to tests/auto/widgets/itemviews/qstandarditemmodel/qstandarditemmodel.pro diff --git a/tests/auto/qstandarditemmodel/tst_qstandarditemmodel.cpp b/tests/auto/widgets/itemviews/qstandarditemmodel/tst_qstandarditemmodel.cpp similarity index 100% rename from tests/auto/qstandarditemmodel/tst_qstandarditemmodel.cpp rename to tests/auto/widgets/itemviews/qstandarditemmodel/tst_qstandarditemmodel.cpp diff --git a/tests/auto/qstringlistmodel/.gitignore b/tests/auto/widgets/itemviews/qstringlistmodel/.gitignore similarity index 100% rename from tests/auto/qstringlistmodel/.gitignore rename to tests/auto/widgets/itemviews/qstringlistmodel/.gitignore diff --git a/tests/auto/qstringlistmodel/qmodellistener.h b/tests/auto/widgets/itemviews/qstringlistmodel/qmodellistener.h similarity index 100% rename from tests/auto/qstringlistmodel/qmodellistener.h rename to tests/auto/widgets/itemviews/qstringlistmodel/qmodellistener.h diff --git a/tests/auto/qstringlistmodel/qstringlistmodel.pro b/tests/auto/widgets/itemviews/qstringlistmodel/qstringlistmodel.pro similarity index 100% rename from tests/auto/qstringlistmodel/qstringlistmodel.pro rename to tests/auto/widgets/itemviews/qstringlistmodel/qstringlistmodel.pro diff --git a/tests/auto/qstringlistmodel/tst_qstringlistmodel.cpp b/tests/auto/widgets/itemviews/qstringlistmodel/tst_qstringlistmodel.cpp similarity index 100% rename from tests/auto/qstringlistmodel/tst_qstringlistmodel.cpp rename to tests/auto/widgets/itemviews/qstringlistmodel/tst_qstringlistmodel.cpp diff --git a/tests/auto/qtableview/.gitignore b/tests/auto/widgets/itemviews/qtableview/.gitignore similarity index 100% rename from tests/auto/qtableview/.gitignore rename to tests/auto/widgets/itemviews/qtableview/.gitignore diff --git a/tests/auto/qtableview/qtableview.pro b/tests/auto/widgets/itemviews/qtableview/qtableview.pro similarity index 100% rename from tests/auto/qtableview/qtableview.pro rename to tests/auto/widgets/itemviews/qtableview/qtableview.pro diff --git a/tests/auto/qtableview/tst_qtableview.cpp b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp similarity index 100% rename from tests/auto/qtableview/tst_qtableview.cpp rename to tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp diff --git a/tests/auto/qtablewidget/.gitignore b/tests/auto/widgets/itemviews/qtablewidget/.gitignore similarity index 100% rename from tests/auto/qtablewidget/.gitignore rename to tests/auto/widgets/itemviews/qtablewidget/.gitignore diff --git a/tests/auto/qtablewidget/qtablewidget.pro b/tests/auto/widgets/itemviews/qtablewidget/qtablewidget.pro similarity index 100% rename from tests/auto/qtablewidget/qtablewidget.pro rename to tests/auto/widgets/itemviews/qtablewidget/qtablewidget.pro diff --git a/tests/auto/qtablewidget/tst_qtablewidget.cpp b/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp similarity index 100% rename from tests/auto/qtablewidget/tst_qtablewidget.cpp rename to tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp diff --git a/tests/auto/qtreeview/.gitignore b/tests/auto/widgets/itemviews/qtreeview/.gitignore similarity index 100% rename from tests/auto/qtreeview/.gitignore rename to tests/auto/widgets/itemviews/qtreeview/.gitignore diff --git a/tests/auto/qtreeview/qtreeview.pro b/tests/auto/widgets/itemviews/qtreeview/qtreeview.pro similarity index 100% rename from tests/auto/qtreeview/qtreeview.pro rename to tests/auto/widgets/itemviews/qtreeview/qtreeview.pro diff --git a/tests/auto/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp similarity index 100% rename from tests/auto/qtreeview/tst_qtreeview.cpp rename to tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp diff --git a/tests/auto/qtreewidget/.gitignore b/tests/auto/widgets/itemviews/qtreewidget/.gitignore similarity index 100% rename from tests/auto/qtreewidget/.gitignore rename to tests/auto/widgets/itemviews/qtreewidget/.gitignore diff --git a/tests/auto/qtreewidget/qtreewidget.pro b/tests/auto/widgets/itemviews/qtreewidget/qtreewidget.pro similarity index 100% rename from tests/auto/qtreewidget/qtreewidget.pro rename to tests/auto/widgets/itemviews/qtreewidget/qtreewidget.pro diff --git a/tests/auto/qtreewidget/tst_qtreewidget.cpp b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp similarity index 100% rename from tests/auto/qtreewidget/tst_qtreewidget.cpp rename to tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp diff --git a/tests/auto/qtreewidgetitemiterator/.gitignore b/tests/auto/widgets/itemviews/qtreewidgetitemiterator/.gitignore similarity index 100% rename from tests/auto/qtreewidgetitemiterator/.gitignore rename to tests/auto/widgets/itemviews/qtreewidgetitemiterator/.gitignore diff --git a/tests/auto/qtreewidgetitemiterator/qtreewidgetitemiterator.pro b/tests/auto/widgets/itemviews/qtreewidgetitemiterator/qtreewidgetitemiterator.pro similarity index 100% rename from tests/auto/qtreewidgetitemiterator/qtreewidgetitemiterator.pro rename to tests/auto/widgets/itemviews/qtreewidgetitemiterator/qtreewidgetitemiterator.pro diff --git a/tests/auto/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp b/tests/auto/widgets/itemviews/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp similarity index 100% rename from tests/auto/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp rename to tests/auto/widgets/itemviews/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp diff --git a/tests/auto/widgets/kernel/kernel.pro b/tests/auto/widgets/kernel/kernel.pro new file mode 100644 index 00000000000..2e55f8eba29 --- /dev/null +++ b/tests/auto/widgets/kernel/kernel.pro @@ -0,0 +1,17 @@ +TEMPLATE=subdirs +SUBDIRS=\ + qaction \ + qactiongroup \ + qapplication \ + qboxlayout \ + qdesktopwidget \ + qformlayout \ + qgridlayout \ + qinputcontext \ + qlayout \ + qsound \ + qstackedlayout \ + qtooltip \ + qwidget \ + qwidget_window \ + qwidgetaction \ diff --git a/tests/auto/qaction/.gitignore b/tests/auto/widgets/kernel/qaction/.gitignore similarity index 100% rename from tests/auto/qaction/.gitignore rename to tests/auto/widgets/kernel/qaction/.gitignore diff --git a/tests/auto/qaction/qaction.pro b/tests/auto/widgets/kernel/qaction/qaction.pro similarity index 100% rename from tests/auto/qaction/qaction.pro rename to tests/auto/widgets/kernel/qaction/qaction.pro diff --git a/tests/auto/qaction/tst_qaction.cpp b/tests/auto/widgets/kernel/qaction/tst_qaction.cpp similarity index 100% rename from tests/auto/qaction/tst_qaction.cpp rename to tests/auto/widgets/kernel/qaction/tst_qaction.cpp diff --git a/tests/auto/qactiongroup/.gitignore b/tests/auto/widgets/kernel/qactiongroup/.gitignore similarity index 100% rename from tests/auto/qactiongroup/.gitignore rename to tests/auto/widgets/kernel/qactiongroup/.gitignore diff --git a/tests/auto/qactiongroup/qactiongroup.pro b/tests/auto/widgets/kernel/qactiongroup/qactiongroup.pro similarity index 100% rename from tests/auto/qactiongroup/qactiongroup.pro rename to tests/auto/widgets/kernel/qactiongroup/qactiongroup.pro diff --git a/tests/auto/qactiongroup/tst_qactiongroup.cpp b/tests/auto/widgets/kernel/qactiongroup/tst_qactiongroup.cpp similarity index 100% rename from tests/auto/qactiongroup/tst_qactiongroup.cpp rename to tests/auto/widgets/kernel/qactiongroup/tst_qactiongroup.cpp diff --git a/tests/auto/qapplication/.gitignore b/tests/auto/widgets/kernel/qapplication/.gitignore similarity index 100% rename from tests/auto/qapplication/.gitignore rename to tests/auto/widgets/kernel/qapplication/.gitignore diff --git a/tests/auto/qapplication/desktopsettingsaware/desktopsettingsaware.pro b/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/desktopsettingsaware.pro similarity index 100% rename from tests/auto/qapplication/desktopsettingsaware/desktopsettingsaware.pro rename to tests/auto/widgets/kernel/qapplication/desktopsettingsaware/desktopsettingsaware.pro diff --git a/tests/auto/qapplication/desktopsettingsaware/main.cpp b/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/main.cpp similarity index 100% rename from tests/auto/qapplication/desktopsettingsaware/main.cpp rename to tests/auto/widgets/kernel/qapplication/desktopsettingsaware/main.cpp diff --git a/tests/auto/qapplication/heart.svg b/tests/auto/widgets/kernel/qapplication/heart.svg similarity index 100% rename from tests/auto/qapplication/heart.svg rename to tests/auto/widgets/kernel/qapplication/heart.svg diff --git a/tests/auto/qapplication/modal/base.cpp b/tests/auto/widgets/kernel/qapplication/modal/base.cpp similarity index 100% rename from tests/auto/qapplication/modal/base.cpp rename to tests/auto/widgets/kernel/qapplication/modal/base.cpp diff --git a/tests/auto/qapplication/modal/base.h b/tests/auto/widgets/kernel/qapplication/modal/base.h similarity index 100% rename from tests/auto/qapplication/modal/base.h rename to tests/auto/widgets/kernel/qapplication/modal/base.h diff --git a/tests/auto/qapplication/modal/main.cpp b/tests/auto/widgets/kernel/qapplication/modal/main.cpp similarity index 100% rename from tests/auto/qapplication/modal/main.cpp rename to tests/auto/widgets/kernel/qapplication/modal/main.cpp diff --git a/tests/auto/qapplication/modal/modal.pro b/tests/auto/widgets/kernel/qapplication/modal/modal.pro similarity index 100% rename from tests/auto/qapplication/modal/modal.pro rename to tests/auto/widgets/kernel/qapplication/modal/modal.pro diff --git a/tests/auto/qapplication/qapplication.pro b/tests/auto/widgets/kernel/qapplication/qapplication.pro similarity index 100% rename from tests/auto/qapplication/qapplication.pro rename to tests/auto/widgets/kernel/qapplication/qapplication.pro diff --git a/tests/auto/qapplication/test/test.pro b/tests/auto/widgets/kernel/qapplication/test/test.pro similarity index 100% rename from tests/auto/qapplication/test/test.pro rename to tests/auto/widgets/kernel/qapplication/test/test.pro diff --git a/tests/auto/qapplication/tmp/README b/tests/auto/widgets/kernel/qapplication/tmp/README similarity index 100% rename from tests/auto/qapplication/tmp/README rename to tests/auto/widgets/kernel/qapplication/tmp/README diff --git a/tests/auto/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp similarity index 100% rename from tests/auto/qapplication/tst_qapplication.cpp rename to tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp diff --git a/tests/auto/qapplication/wincmdline/main.cpp b/tests/auto/widgets/kernel/qapplication/wincmdline/main.cpp similarity index 100% rename from tests/auto/qapplication/wincmdline/main.cpp rename to tests/auto/widgets/kernel/qapplication/wincmdline/main.cpp diff --git a/tests/auto/qapplication/wincmdline/wincmdline.pro b/tests/auto/widgets/kernel/qapplication/wincmdline/wincmdline.pro similarity index 100% rename from tests/auto/qapplication/wincmdline/wincmdline.pro rename to tests/auto/widgets/kernel/qapplication/wincmdline/wincmdline.pro diff --git a/tests/auto/qboxlayout/.gitignore b/tests/auto/widgets/kernel/qboxlayout/.gitignore similarity index 100% rename from tests/auto/qboxlayout/.gitignore rename to tests/auto/widgets/kernel/qboxlayout/.gitignore diff --git a/tests/auto/qboxlayout/qboxlayout.pro b/tests/auto/widgets/kernel/qboxlayout/qboxlayout.pro similarity index 100% rename from tests/auto/qboxlayout/qboxlayout.pro rename to tests/auto/widgets/kernel/qboxlayout/qboxlayout.pro diff --git a/tests/auto/qboxlayout/tst_qboxlayout.cpp b/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp similarity index 100% rename from tests/auto/qboxlayout/tst_qboxlayout.cpp rename to tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp diff --git a/tests/auto/qdesktopwidget/.gitignore b/tests/auto/widgets/kernel/qdesktopwidget/.gitignore similarity index 100% rename from tests/auto/qdesktopwidget/.gitignore rename to tests/auto/widgets/kernel/qdesktopwidget/.gitignore diff --git a/tests/auto/qdesktopwidget/qdesktopwidget.pro b/tests/auto/widgets/kernel/qdesktopwidget/qdesktopwidget.pro similarity index 100% rename from tests/auto/qdesktopwidget/qdesktopwidget.pro rename to tests/auto/widgets/kernel/qdesktopwidget/qdesktopwidget.pro diff --git a/tests/auto/qdesktopwidget/tst_qdesktopwidget.cpp b/tests/auto/widgets/kernel/qdesktopwidget/tst_qdesktopwidget.cpp similarity index 100% rename from tests/auto/qdesktopwidget/tst_qdesktopwidget.cpp rename to tests/auto/widgets/kernel/qdesktopwidget/tst_qdesktopwidget.cpp diff --git a/tests/auto/qformlayout/.gitignore b/tests/auto/widgets/kernel/qformlayout/.gitignore similarity index 100% rename from tests/auto/qformlayout/.gitignore rename to tests/auto/widgets/kernel/qformlayout/.gitignore diff --git a/tests/auto/qformlayout/qformlayout.pro b/tests/auto/widgets/kernel/qformlayout/qformlayout.pro similarity index 100% rename from tests/auto/qformlayout/qformlayout.pro rename to tests/auto/widgets/kernel/qformlayout/qformlayout.pro diff --git a/tests/auto/qformlayout/tst_qformlayout.cpp b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp similarity index 100% rename from tests/auto/qformlayout/tst_qformlayout.cpp rename to tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp diff --git a/tests/auto/qgridlayout/.gitignore b/tests/auto/widgets/kernel/qgridlayout/.gitignore similarity index 100% rename from tests/auto/qgridlayout/.gitignore rename to tests/auto/widgets/kernel/qgridlayout/.gitignore diff --git a/tests/auto/qgridlayout/qgridlayout.pro b/tests/auto/widgets/kernel/qgridlayout/qgridlayout.pro similarity index 100% rename from tests/auto/qgridlayout/qgridlayout.pro rename to tests/auto/widgets/kernel/qgridlayout/qgridlayout.pro diff --git a/tests/auto/qgridlayout/sortdialog.ui b/tests/auto/widgets/kernel/qgridlayout/sortdialog.ui similarity index 100% rename from tests/auto/qgridlayout/sortdialog.ui rename to tests/auto/widgets/kernel/qgridlayout/sortdialog.ui diff --git a/tests/auto/qgridlayout/tst_qgridlayout.cpp b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp similarity index 99% rename from tests/auto/qgridlayout/tst_qgridlayout.cpp rename to tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp index 3b352644f32..100b7eb8927 100644 --- a/tests/auto/qgridlayout/tst_qgridlayout.cpp +++ b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp @@ -54,7 +54,7 @@ #include #include -#include "../platformquirks.h" +#include "../../../platformquirks.h" //TESTED_CLASS= //TESTED_FILES=gui/kernel/qlayout.cpp gui/kernel/qlayout.h diff --git a/tests/auto/qinputcontext/qinputcontext.pro b/tests/auto/widgets/kernel/qinputcontext/qinputcontext.pro similarity index 100% rename from tests/auto/qinputcontext/qinputcontext.pro rename to tests/auto/widgets/kernel/qinputcontext/qinputcontext.pro diff --git a/tests/auto/qinputcontext/tst_qinputcontext.cpp b/tests/auto/widgets/kernel/qinputcontext/tst_qinputcontext.cpp similarity index 100% rename from tests/auto/qinputcontext/tst_qinputcontext.cpp rename to tests/auto/widgets/kernel/qinputcontext/tst_qinputcontext.cpp diff --git a/tests/auto/qlayout/.gitignore b/tests/auto/widgets/kernel/qlayout/.gitignore similarity index 100% rename from tests/auto/qlayout/.gitignore rename to tests/auto/widgets/kernel/qlayout/.gitignore diff --git a/tests/auto/qlayout/baseline/smartmaxsize b/tests/auto/widgets/kernel/qlayout/baseline/smartmaxsize similarity index 100% rename from tests/auto/qlayout/baseline/smartmaxsize rename to tests/auto/widgets/kernel/qlayout/baseline/smartmaxsize diff --git a/tests/auto/qlayout/qlayout.pro b/tests/auto/widgets/kernel/qlayout/qlayout.pro similarity index 100% rename from tests/auto/qlayout/qlayout.pro rename to tests/auto/widgets/kernel/qlayout/qlayout.pro diff --git a/tests/auto/qlayout/tst_qlayout.cpp b/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp similarity index 100% rename from tests/auto/qlayout/tst_qlayout.cpp rename to tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp diff --git a/tests/auto/qsound/.gitignore b/tests/auto/widgets/kernel/qsound/.gitignore similarity index 100% rename from tests/auto/qsound/.gitignore rename to tests/auto/widgets/kernel/qsound/.gitignore diff --git a/tests/auto/qsound/4.wav b/tests/auto/widgets/kernel/qsound/4.wav similarity index 100% rename from tests/auto/qsound/4.wav rename to tests/auto/widgets/kernel/qsound/4.wav diff --git a/tests/auto/qsound/qsound.pro b/tests/auto/widgets/kernel/qsound/qsound.pro similarity index 100% rename from tests/auto/qsound/qsound.pro rename to tests/auto/widgets/kernel/qsound/qsound.pro diff --git a/tests/auto/qsound/tst_qsound.cpp b/tests/auto/widgets/kernel/qsound/tst_qsound.cpp similarity index 100% rename from tests/auto/qsound/tst_qsound.cpp rename to tests/auto/widgets/kernel/qsound/tst_qsound.cpp diff --git a/tests/auto/qstackedlayout/.gitignore b/tests/auto/widgets/kernel/qstackedlayout/.gitignore similarity index 100% rename from tests/auto/qstackedlayout/.gitignore rename to tests/auto/widgets/kernel/qstackedlayout/.gitignore diff --git a/tests/auto/qstackedlayout/qstackedlayout.pro b/tests/auto/widgets/kernel/qstackedlayout/qstackedlayout.pro similarity index 100% rename from tests/auto/qstackedlayout/qstackedlayout.pro rename to tests/auto/widgets/kernel/qstackedlayout/qstackedlayout.pro diff --git a/tests/auto/qstackedlayout/tst_qstackedlayout.cpp b/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp similarity index 100% rename from tests/auto/qstackedlayout/tst_qstackedlayout.cpp rename to tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp diff --git a/tests/auto/qtooltip/.gitignore b/tests/auto/widgets/kernel/qtooltip/.gitignore similarity index 100% rename from tests/auto/qtooltip/.gitignore rename to tests/auto/widgets/kernel/qtooltip/.gitignore diff --git a/tests/auto/qtooltip/qtooltip.pro b/tests/auto/widgets/kernel/qtooltip/qtooltip.pro similarity index 100% rename from tests/auto/qtooltip/qtooltip.pro rename to tests/auto/widgets/kernel/qtooltip/qtooltip.pro diff --git a/tests/auto/qtooltip/tst_qtooltip.cpp b/tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp similarity index 100% rename from tests/auto/qtooltip/tst_qtooltip.cpp rename to tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp diff --git a/tests/auto/qwidget/.gitignore b/tests/auto/widgets/kernel/qwidget/.gitignore similarity index 100% rename from tests/auto/qwidget/.gitignore rename to tests/auto/widgets/kernel/qwidget/.gitignore diff --git a/tests/auto/qwidget/geometry-fullscreen.dat b/tests/auto/widgets/kernel/qwidget/geometry-fullscreen.dat similarity index 100% rename from tests/auto/qwidget/geometry-fullscreen.dat rename to tests/auto/widgets/kernel/qwidget/geometry-fullscreen.dat diff --git a/tests/auto/qwidget/geometry-maximized.dat b/tests/auto/widgets/kernel/qwidget/geometry-maximized.dat similarity index 100% rename from tests/auto/qwidget/geometry-maximized.dat rename to tests/auto/widgets/kernel/qwidget/geometry-maximized.dat diff --git a/tests/auto/qwidget/geometry.dat b/tests/auto/widgets/kernel/qwidget/geometry.dat similarity index 100% rename from tests/auto/qwidget/geometry.dat rename to tests/auto/widgets/kernel/qwidget/geometry.dat diff --git a/tests/auto/qwidget/qwidget.pro b/tests/auto/widgets/kernel/qwidget/qwidget.pro similarity index 100% rename from tests/auto/qwidget/qwidget.pro rename to tests/auto/widgets/kernel/qwidget/qwidget.pro diff --git a/tests/auto/qwidget/qwidget.qrc b/tests/auto/widgets/kernel/qwidget/qwidget.qrc similarity index 100% rename from tests/auto/qwidget/qwidget.qrc rename to tests/auto/widgets/kernel/qwidget/qwidget.qrc diff --git a/tests/auto/qwidget/testdata/paintEvent/res_Motif_data0.qsnap b/tests/auto/widgets/kernel/qwidget/testdata/paintEvent/res_Motif_data0.qsnap similarity index 100% rename from tests/auto/qwidget/testdata/paintEvent/res_Motif_data0.qsnap rename to tests/auto/widgets/kernel/qwidget/testdata/paintEvent/res_Motif_data0.qsnap diff --git a/tests/auto/qwidget/testdata/paintEvent/res_Motif_data1.qsnap b/tests/auto/widgets/kernel/qwidget/testdata/paintEvent/res_Motif_data1.qsnap similarity index 100% rename from tests/auto/qwidget/testdata/paintEvent/res_Motif_data1.qsnap rename to tests/auto/widgets/kernel/qwidget/testdata/paintEvent/res_Motif_data1.qsnap diff --git a/tests/auto/qwidget/testdata/paintEvent/res_Motif_data2.qsnap b/tests/auto/widgets/kernel/qwidget/testdata/paintEvent/res_Motif_data2.qsnap similarity index 100% rename from tests/auto/qwidget/testdata/paintEvent/res_Motif_data2.qsnap rename to tests/auto/widgets/kernel/qwidget/testdata/paintEvent/res_Motif_data2.qsnap diff --git a/tests/auto/qwidget/testdata/paintEvent/res_Motif_data3.qsnap b/tests/auto/widgets/kernel/qwidget/testdata/paintEvent/res_Motif_data3.qsnap similarity index 100% rename from tests/auto/qwidget/testdata/paintEvent/res_Motif_data3.qsnap rename to tests/auto/widgets/kernel/qwidget/testdata/paintEvent/res_Motif_data3.qsnap diff --git a/tests/auto/qwidget/testdata/paintEvent/res_Windows_data0.qsnap b/tests/auto/widgets/kernel/qwidget/testdata/paintEvent/res_Windows_data0.qsnap similarity index 100% rename from tests/auto/qwidget/testdata/paintEvent/res_Windows_data0.qsnap rename to tests/auto/widgets/kernel/qwidget/testdata/paintEvent/res_Windows_data0.qsnap diff --git a/tests/auto/qwidget/testdata/paintEvent/res_Windows_data1.qsnap b/tests/auto/widgets/kernel/qwidget/testdata/paintEvent/res_Windows_data1.qsnap similarity index 100% rename from tests/auto/qwidget/testdata/paintEvent/res_Windows_data1.qsnap rename to tests/auto/widgets/kernel/qwidget/testdata/paintEvent/res_Windows_data1.qsnap diff --git a/tests/auto/qwidget/testdata/paintEvent/res_Windows_data2.qsnap b/tests/auto/widgets/kernel/qwidget/testdata/paintEvent/res_Windows_data2.qsnap similarity index 100% rename from tests/auto/qwidget/testdata/paintEvent/res_Windows_data2.qsnap rename to tests/auto/widgets/kernel/qwidget/testdata/paintEvent/res_Windows_data2.qsnap diff --git a/tests/auto/qwidget/testdata/paintEvent/res_Windows_data3.qsnap b/tests/auto/widgets/kernel/qwidget/testdata/paintEvent/res_Windows_data3.qsnap similarity index 100% rename from tests/auto/qwidget/testdata/paintEvent/res_Windows_data3.qsnap rename to tests/auto/widgets/kernel/qwidget/testdata/paintEvent/res_Windows_data3.qsnap diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp similarity index 100% rename from tests/auto/qwidget/tst_qwidget.cpp rename to tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp diff --git a/tests/auto/qwidget/tst_qwidget_mac_helpers.h b/tests/auto/widgets/kernel/qwidget/tst_qwidget_mac_helpers.h similarity index 100% rename from tests/auto/qwidget/tst_qwidget_mac_helpers.h rename to tests/auto/widgets/kernel/qwidget/tst_qwidget_mac_helpers.h diff --git a/tests/auto/qwidget/tst_qwidget_mac_helpers.mm b/tests/auto/widgets/kernel/qwidget/tst_qwidget_mac_helpers.mm similarity index 100% rename from tests/auto/qwidget/tst_qwidget_mac_helpers.mm rename to tests/auto/widgets/kernel/qwidget/tst_qwidget_mac_helpers.mm diff --git a/tests/auto/qwidget_window/.gitignore b/tests/auto/widgets/kernel/qwidget_window/.gitignore similarity index 100% rename from tests/auto/qwidget_window/.gitignore rename to tests/auto/widgets/kernel/qwidget_window/.gitignore diff --git a/tests/auto/qwidget_window/qwidget_window.pro b/tests/auto/widgets/kernel/qwidget_window/qwidget_window.pro similarity index 100% rename from tests/auto/qwidget_window/qwidget_window.pro rename to tests/auto/widgets/kernel/qwidget_window/qwidget_window.pro diff --git a/tests/auto/qwidget_window/tst_qwidget_window.cpp b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp similarity index 100% rename from tests/auto/qwidget_window/tst_qwidget_window.cpp rename to tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp diff --git a/tests/auto/qwidgetaction/.gitignore b/tests/auto/widgets/kernel/qwidgetaction/.gitignore similarity index 100% rename from tests/auto/qwidgetaction/.gitignore rename to tests/auto/widgets/kernel/qwidgetaction/.gitignore diff --git a/tests/auto/qwidgetaction/qwidgetaction.pro b/tests/auto/widgets/kernel/qwidgetaction/qwidgetaction.pro similarity index 100% rename from tests/auto/qwidgetaction/qwidgetaction.pro rename to tests/auto/widgets/kernel/qwidgetaction/qwidgetaction.pro diff --git a/tests/auto/qwidgetaction/tst_qwidgetaction.cpp b/tests/auto/widgets/kernel/qwidgetaction/tst_qwidgetaction.cpp similarity index 100% rename from tests/auto/qwidgetaction/tst_qwidgetaction.cpp rename to tests/auto/widgets/kernel/qwidgetaction/tst_qwidgetaction.cpp diff --git a/tests/auto/qmacstyle/.gitignore b/tests/auto/widgets/styles/qmacstyle/.gitignore similarity index 100% rename from tests/auto/qmacstyle/.gitignore rename to tests/auto/widgets/styles/qmacstyle/.gitignore diff --git a/tests/auto/qmacstyle/qmacstyle.pro b/tests/auto/widgets/styles/qmacstyle/qmacstyle.pro similarity index 100% rename from tests/auto/qmacstyle/qmacstyle.pro rename to tests/auto/widgets/styles/qmacstyle/qmacstyle.pro diff --git a/tests/auto/qmacstyle/tst_qmacstyle.cpp b/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp similarity index 100% rename from tests/auto/qmacstyle/tst_qmacstyle.cpp rename to tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp diff --git a/tests/auto/qstyle/.gitignore b/tests/auto/widgets/styles/qstyle/.gitignore similarity index 100% rename from tests/auto/qstyle/.gitignore rename to tests/auto/widgets/styles/qstyle/.gitignore diff --git a/tests/auto/qstyle/images/mac/button.png b/tests/auto/widgets/styles/qstyle/images/mac/button.png similarity index 100% rename from tests/auto/qstyle/images/mac/button.png rename to tests/auto/widgets/styles/qstyle/images/mac/button.png diff --git a/tests/auto/qstyle/images/mac/combobox.png b/tests/auto/widgets/styles/qstyle/images/mac/combobox.png similarity index 100% rename from tests/auto/qstyle/images/mac/combobox.png rename to tests/auto/widgets/styles/qstyle/images/mac/combobox.png diff --git a/tests/auto/qstyle/images/mac/lineedit.png b/tests/auto/widgets/styles/qstyle/images/mac/lineedit.png similarity index 100% rename from tests/auto/qstyle/images/mac/lineedit.png rename to tests/auto/widgets/styles/qstyle/images/mac/lineedit.png diff --git a/tests/auto/qstyle/images/mac/mdi.png b/tests/auto/widgets/styles/qstyle/images/mac/mdi.png similarity index 100% rename from tests/auto/qstyle/images/mac/mdi.png rename to tests/auto/widgets/styles/qstyle/images/mac/mdi.png diff --git a/tests/auto/qstyle/images/mac/menu.png b/tests/auto/widgets/styles/qstyle/images/mac/menu.png similarity index 100% rename from tests/auto/qstyle/images/mac/menu.png rename to tests/auto/widgets/styles/qstyle/images/mac/menu.png diff --git a/tests/auto/qstyle/images/mac/radiobutton.png b/tests/auto/widgets/styles/qstyle/images/mac/radiobutton.png similarity index 100% rename from tests/auto/qstyle/images/mac/radiobutton.png rename to tests/auto/widgets/styles/qstyle/images/mac/radiobutton.png diff --git a/tests/auto/qstyle/images/mac/slider.png b/tests/auto/widgets/styles/qstyle/images/mac/slider.png similarity index 100% rename from tests/auto/qstyle/images/mac/slider.png rename to tests/auto/widgets/styles/qstyle/images/mac/slider.png diff --git a/tests/auto/qstyle/images/mac/spinbox.png b/tests/auto/widgets/styles/qstyle/images/mac/spinbox.png similarity index 100% rename from tests/auto/qstyle/images/mac/spinbox.png rename to tests/auto/widgets/styles/qstyle/images/mac/spinbox.png diff --git a/tests/auto/qstyle/images/vista/button.png b/tests/auto/widgets/styles/qstyle/images/vista/button.png similarity index 100% rename from tests/auto/qstyle/images/vista/button.png rename to tests/auto/widgets/styles/qstyle/images/vista/button.png diff --git a/tests/auto/qstyle/images/vista/combobox.png b/tests/auto/widgets/styles/qstyle/images/vista/combobox.png similarity index 100% rename from tests/auto/qstyle/images/vista/combobox.png rename to tests/auto/widgets/styles/qstyle/images/vista/combobox.png diff --git a/tests/auto/qstyle/images/vista/lineedit.png b/tests/auto/widgets/styles/qstyle/images/vista/lineedit.png similarity index 100% rename from tests/auto/qstyle/images/vista/lineedit.png rename to tests/auto/widgets/styles/qstyle/images/vista/lineedit.png diff --git a/tests/auto/qstyle/images/vista/menu.png b/tests/auto/widgets/styles/qstyle/images/vista/menu.png similarity index 100% rename from tests/auto/qstyle/images/vista/menu.png rename to tests/auto/widgets/styles/qstyle/images/vista/menu.png diff --git a/tests/auto/qstyle/images/vista/radiobutton.png b/tests/auto/widgets/styles/qstyle/images/vista/radiobutton.png similarity index 100% rename from tests/auto/qstyle/images/vista/radiobutton.png rename to tests/auto/widgets/styles/qstyle/images/vista/radiobutton.png diff --git a/tests/auto/qstyle/images/vista/slider.png b/tests/auto/widgets/styles/qstyle/images/vista/slider.png similarity index 100% rename from tests/auto/qstyle/images/vista/slider.png rename to tests/auto/widgets/styles/qstyle/images/vista/slider.png diff --git a/tests/auto/qstyle/images/vista/spinbox.png b/tests/auto/widgets/styles/qstyle/images/vista/spinbox.png similarity index 100% rename from tests/auto/qstyle/images/vista/spinbox.png rename to tests/auto/widgets/styles/qstyle/images/vista/spinbox.png diff --git a/tests/auto/qstyle/qstyle.pro b/tests/auto/widgets/styles/qstyle/qstyle.pro similarity index 100% rename from tests/auto/qstyle/qstyle.pro rename to tests/auto/widgets/styles/qstyle/qstyle.pro diff --git a/tests/auto/qstyle/task_25863.png b/tests/auto/widgets/styles/qstyle/task_25863.png similarity index 100% rename from tests/auto/qstyle/task_25863.png rename to tests/auto/widgets/styles/qstyle/task_25863.png diff --git a/tests/auto/qstyle/tst_qstyle.cpp b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp similarity index 100% rename from tests/auto/qstyle/tst_qstyle.cpp rename to tests/auto/widgets/styles/qstyle/tst_qstyle.cpp diff --git a/tests/auto/qstyleoption/.gitignore b/tests/auto/widgets/styles/qstyleoption/.gitignore similarity index 100% rename from tests/auto/qstyleoption/.gitignore rename to tests/auto/widgets/styles/qstyleoption/.gitignore diff --git a/tests/auto/qstyleoption/qstyleoption.pro b/tests/auto/widgets/styles/qstyleoption/qstyleoption.pro similarity index 100% rename from tests/auto/qstyleoption/qstyleoption.pro rename to tests/auto/widgets/styles/qstyleoption/qstyleoption.pro diff --git a/tests/auto/qstyleoption/tst_qstyleoption.cpp b/tests/auto/widgets/styles/qstyleoption/tst_qstyleoption.cpp similarity index 100% rename from tests/auto/qstyleoption/tst_qstyleoption.cpp rename to tests/auto/widgets/styles/qstyleoption/tst_qstyleoption.cpp diff --git a/tests/auto/qstylesheetstyle/.gitignore b/tests/auto/widgets/styles/qstylesheetstyle/.gitignore similarity index 100% rename from tests/auto/qstylesheetstyle/.gitignore rename to tests/auto/widgets/styles/qstylesheetstyle/.gitignore diff --git a/tests/auto/qstylesheetstyle/images/testimage.png b/tests/auto/widgets/styles/qstylesheetstyle/images/testimage.png similarity index 100% rename from tests/auto/qstylesheetstyle/images/testimage.png rename to tests/auto/widgets/styles/qstylesheetstyle/images/testimage.png diff --git a/tests/auto/qstylesheetstyle/qstylesheetstyle.pro b/tests/auto/widgets/styles/qstylesheetstyle/qstylesheetstyle.pro similarity index 100% rename from tests/auto/qstylesheetstyle/qstylesheetstyle.pro rename to tests/auto/widgets/styles/qstylesheetstyle/qstylesheetstyle.pro diff --git a/tests/auto/qstylesheetstyle/resources.qrc b/tests/auto/widgets/styles/qstylesheetstyle/resources.qrc similarity index 100% rename from tests/auto/qstylesheetstyle/resources.qrc rename to tests/auto/widgets/styles/qstylesheetstyle/resources.qrc diff --git a/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp b/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp similarity index 99% rename from tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp rename to tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp index 98e64eb17d8..c5591c48abe 100644 --- a/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp +++ b/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp @@ -46,7 +46,7 @@ #include #include -#include "../platformquirks.h" +#include "../../../platformquirks.h" //TESTED_CLASS= //TESTED_FILES= diff --git a/tests/auto/widgets/styles/styles.pro b/tests/auto/widgets/styles/styles.pro new file mode 100644 index 00000000000..7e931582dbf --- /dev/null +++ b/tests/auto/widgets/styles/styles.pro @@ -0,0 +1,13 @@ +TEMPLATE=subdirs +SUBDIRS=\ + qmacstyle \ + qstyle \ + qstyleoption \ + qstylesheetstyle \ + +!contains(QT_CONFIG, private_tests): SUBDIRS -= \ + qstylesheetstyle \ + +# This test can only be run on Mac OS: +!mac:SUBDIRS -= \ + qmacstyle \ diff --git a/tests/auto/qcompleter/.gitignore b/tests/auto/widgets/util/qcompleter/.gitignore similarity index 100% rename from tests/auto/qcompleter/.gitignore rename to tests/auto/widgets/util/qcompleter/.gitignore diff --git a/tests/auto/qcompleter/qcompleter.pro b/tests/auto/widgets/util/qcompleter/qcompleter.pro similarity index 100% rename from tests/auto/qcompleter/qcompleter.pro rename to tests/auto/widgets/util/qcompleter/qcompleter.pro diff --git a/tests/auto/qcompleter/tst_qcompleter.cpp b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp similarity index 99% rename from tests/auto/qcompleter/tst_qcompleter.cpp rename to tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp index b0720b87764..ccf3c449b3d 100644 --- a/tests/auto/qcompleter/tst_qcompleter.cpp +++ b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp @@ -47,7 +47,7 @@ #include #include -#include "../../shared/filesystem.h" +#include "../../../../shared/filesystem.h" //TESTED_CLASS= //TESTED_FILES= diff --git a/tests/auto/qscroller/qscroller.pro b/tests/auto/widgets/util/qscroller/qscroller.pro similarity index 100% rename from tests/auto/qscroller/qscroller.pro rename to tests/auto/widgets/util/qscroller/qscroller.pro diff --git a/tests/auto/qscroller/tst_qscroller.cpp b/tests/auto/widgets/util/qscroller/tst_qscroller.cpp similarity index 100% rename from tests/auto/qscroller/tst_qscroller.cpp rename to tests/auto/widgets/util/qscroller/tst_qscroller.cpp diff --git a/tests/auto/qsystemtrayicon/.gitignore b/tests/auto/widgets/util/qsystemtrayicon/.gitignore similarity index 100% rename from tests/auto/qsystemtrayicon/.gitignore rename to tests/auto/widgets/util/qsystemtrayicon/.gitignore diff --git a/tests/auto/qsystemtrayicon/icons/icon.png b/tests/auto/widgets/util/qsystemtrayicon/icons/icon.png similarity index 100% rename from tests/auto/qsystemtrayicon/icons/icon.png rename to tests/auto/widgets/util/qsystemtrayicon/icons/icon.png diff --git a/tests/auto/qsystemtrayicon/qsystemtrayicon.pro b/tests/auto/widgets/util/qsystemtrayicon/qsystemtrayicon.pro similarity index 100% rename from tests/auto/qsystemtrayicon/qsystemtrayicon.pro rename to tests/auto/widgets/util/qsystemtrayicon/qsystemtrayicon.pro diff --git a/tests/auto/qsystemtrayicon/tst_qsystemtrayicon.cpp b/tests/auto/widgets/util/qsystemtrayicon/tst_qsystemtrayicon.cpp similarity index 100% rename from tests/auto/qsystemtrayicon/tst_qsystemtrayicon.cpp rename to tests/auto/widgets/util/qsystemtrayicon/tst_qsystemtrayicon.cpp diff --git a/tests/auto/qundogroup/.gitignore b/tests/auto/widgets/util/qundogroup/.gitignore similarity index 100% rename from tests/auto/qundogroup/.gitignore rename to tests/auto/widgets/util/qundogroup/.gitignore diff --git a/tests/auto/qundogroup/qundogroup.pro b/tests/auto/widgets/util/qundogroup/qundogroup.pro similarity index 100% rename from tests/auto/qundogroup/qundogroup.pro rename to tests/auto/widgets/util/qundogroup/qundogroup.pro diff --git a/tests/auto/qundogroup/testdata/qundogroup.ts b/tests/auto/widgets/util/qundogroup/testdata/qundogroup.ts similarity index 100% rename from tests/auto/qundogroup/testdata/qundogroup.ts rename to tests/auto/widgets/util/qundogroup/testdata/qundogroup.ts diff --git a/tests/auto/qundogroup/tst_qundogroup.cpp b/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp similarity index 100% rename from tests/auto/qundogroup/tst_qundogroup.cpp rename to tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp diff --git a/tests/auto/qundostack/.gitignore b/tests/auto/widgets/util/qundostack/.gitignore similarity index 100% rename from tests/auto/qundostack/.gitignore rename to tests/auto/widgets/util/qundostack/.gitignore diff --git a/tests/auto/qundostack/qundostack.pro b/tests/auto/widgets/util/qundostack/qundostack.pro similarity index 100% rename from tests/auto/qundostack/qundostack.pro rename to tests/auto/widgets/util/qundostack/qundostack.pro diff --git a/tests/auto/qundostack/testdata/qundostack.ts b/tests/auto/widgets/util/qundostack/testdata/qundostack.ts similarity index 100% rename from tests/auto/qundostack/testdata/qundostack.ts rename to tests/auto/widgets/util/qundostack/testdata/qundostack.ts diff --git a/tests/auto/qundostack/tst_qundostack.cpp b/tests/auto/widgets/util/qundostack/tst_qundostack.cpp similarity index 100% rename from tests/auto/qundostack/tst_qundostack.cpp rename to tests/auto/widgets/util/qundostack/tst_qundostack.cpp diff --git a/tests/auto/widgets/util/util.pro b/tests/auto/widgets/util/util.pro new file mode 100644 index 00000000000..b7fe35ce4c6 --- /dev/null +++ b/tests/auto/widgets/util/util.pro @@ -0,0 +1,11 @@ +TEMPLATE=subdirs +SUBDIRS=\ + qcompleter \ + qscroller \ + qsystemtrayicon \ + qundogroup \ + qundostack \ + +symbian:SUBDIRS -= \ + qsystemtrayicon \ + diff --git a/tests/auto/widgets/widgets.pro b/tests/auto/widgets/widgets.pro new file mode 100644 index 00000000000..8b6c4722be0 --- /dev/null +++ b/tests/auto/widgets/widgets.pro @@ -0,0 +1,10 @@ +TEMPLATE=subdirs +SUBDIRS=\ + dialogs \ + effects \ + graphicsview \ + itemviews \ + kernel \ + styles \ + util \ + widgets \ diff --git a/tests/auto/qabstractbutton/.gitignore b/tests/auto/widgets/widgets/qabstractbutton/.gitignore similarity index 100% rename from tests/auto/qabstractbutton/.gitignore rename to tests/auto/widgets/widgets/qabstractbutton/.gitignore diff --git a/tests/auto/qabstractbutton/qabstractbutton.pro b/tests/auto/widgets/widgets/qabstractbutton/qabstractbutton.pro similarity index 100% rename from tests/auto/qabstractbutton/qabstractbutton.pro rename to tests/auto/widgets/widgets/qabstractbutton/qabstractbutton.pro diff --git a/tests/auto/qabstractbutton/tst_qabstractbutton.cpp b/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp similarity index 100% rename from tests/auto/qabstractbutton/tst_qabstractbutton.cpp rename to tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp diff --git a/tests/auto/qabstractscrollarea/.gitignore b/tests/auto/widgets/widgets/qabstractscrollarea/.gitignore similarity index 100% rename from tests/auto/qabstractscrollarea/.gitignore rename to tests/auto/widgets/widgets/qabstractscrollarea/.gitignore diff --git a/tests/auto/qabstractscrollarea/qabstractscrollarea.pro b/tests/auto/widgets/widgets/qabstractscrollarea/qabstractscrollarea.pro similarity index 100% rename from tests/auto/qabstractscrollarea/qabstractscrollarea.pro rename to tests/auto/widgets/widgets/qabstractscrollarea/qabstractscrollarea.pro diff --git a/tests/auto/qabstractscrollarea/tst_qabstractscrollarea.cpp b/tests/auto/widgets/widgets/qabstractscrollarea/tst_qabstractscrollarea.cpp similarity index 100% rename from tests/auto/qabstractscrollarea/tst_qabstractscrollarea.cpp rename to tests/auto/widgets/widgets/qabstractscrollarea/tst_qabstractscrollarea.cpp diff --git a/tests/auto/qabstractslider/.gitignore b/tests/auto/widgets/widgets/qabstractslider/.gitignore similarity index 100% rename from tests/auto/qabstractslider/.gitignore rename to tests/auto/widgets/widgets/qabstractslider/.gitignore diff --git a/tests/auto/qabstractslider/qabstractslider.pro b/tests/auto/widgets/widgets/qabstractslider/qabstractslider.pro similarity index 100% rename from tests/auto/qabstractslider/qabstractslider.pro rename to tests/auto/widgets/widgets/qabstractslider/qabstractslider.pro diff --git a/tests/auto/qabstractslider/tst_qabstractslider.cpp b/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp similarity index 100% rename from tests/auto/qabstractslider/tst_qabstractslider.cpp rename to tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp diff --git a/tests/auto/qabstractspinbox/.gitignore b/tests/auto/widgets/widgets/qabstractspinbox/.gitignore similarity index 100% rename from tests/auto/qabstractspinbox/.gitignore rename to tests/auto/widgets/widgets/qabstractspinbox/.gitignore diff --git a/tests/auto/qabstractspinbox/qabstractspinbox.pro b/tests/auto/widgets/widgets/qabstractspinbox/qabstractspinbox.pro similarity index 100% rename from tests/auto/qabstractspinbox/qabstractspinbox.pro rename to tests/auto/widgets/widgets/qabstractspinbox/qabstractspinbox.pro diff --git a/tests/auto/qabstractspinbox/tst_qabstractspinbox.cpp b/tests/auto/widgets/widgets/qabstractspinbox/tst_qabstractspinbox.cpp similarity index 100% rename from tests/auto/qabstractspinbox/tst_qabstractspinbox.cpp rename to tests/auto/widgets/widgets/qabstractspinbox/tst_qabstractspinbox.cpp diff --git a/tests/auto/qbuttongroup/.gitignore b/tests/auto/widgets/widgets/qbuttongroup/.gitignore similarity index 100% rename from tests/auto/qbuttongroup/.gitignore rename to tests/auto/widgets/widgets/qbuttongroup/.gitignore diff --git a/tests/auto/qbuttongroup/qbuttongroup.pro b/tests/auto/widgets/widgets/qbuttongroup/qbuttongroup.pro similarity index 100% rename from tests/auto/qbuttongroup/qbuttongroup.pro rename to tests/auto/widgets/widgets/qbuttongroup/qbuttongroup.pro diff --git a/tests/auto/qbuttongroup/tst_qbuttongroup.cpp b/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp similarity index 100% rename from tests/auto/qbuttongroup/tst_qbuttongroup.cpp rename to tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp diff --git a/tests/auto/qcalendarwidget/.gitignore b/tests/auto/widgets/widgets/qcalendarwidget/.gitignore similarity index 100% rename from tests/auto/qcalendarwidget/.gitignore rename to tests/auto/widgets/widgets/qcalendarwidget/.gitignore diff --git a/tests/auto/qcalendarwidget/qcalendarwidget.pro b/tests/auto/widgets/widgets/qcalendarwidget/qcalendarwidget.pro similarity index 100% rename from tests/auto/qcalendarwidget/qcalendarwidget.pro rename to tests/auto/widgets/widgets/qcalendarwidget/qcalendarwidget.pro diff --git a/tests/auto/qcalendarwidget/tst_qcalendarwidget.cpp b/tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp similarity index 100% rename from tests/auto/qcalendarwidget/tst_qcalendarwidget.cpp rename to tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp diff --git a/tests/auto/qcheckbox/.gitignore b/tests/auto/widgets/widgets/qcheckbox/.gitignore similarity index 100% rename from tests/auto/qcheckbox/.gitignore rename to tests/auto/widgets/widgets/qcheckbox/.gitignore diff --git a/tests/auto/qcheckbox/qcheckbox.pro b/tests/auto/widgets/widgets/qcheckbox/qcheckbox.pro similarity index 100% rename from tests/auto/qcheckbox/qcheckbox.pro rename to tests/auto/widgets/widgets/qcheckbox/qcheckbox.pro diff --git a/tests/auto/qcheckbox/tst_qcheckbox.cpp b/tests/auto/widgets/widgets/qcheckbox/tst_qcheckbox.cpp similarity index 100% rename from tests/auto/qcheckbox/tst_qcheckbox.cpp rename to tests/auto/widgets/widgets/qcheckbox/tst_qcheckbox.cpp diff --git a/tests/auto/qcombobox/.gitignore b/tests/auto/widgets/widgets/qcombobox/.gitignore similarity index 100% rename from tests/auto/qcombobox/.gitignore rename to tests/auto/widgets/widgets/qcombobox/.gitignore diff --git a/tests/auto/qcombobox/qcombobox.pro b/tests/auto/widgets/widgets/qcombobox/qcombobox.pro similarity index 100% rename from tests/auto/qcombobox/qcombobox.pro rename to tests/auto/widgets/widgets/qcombobox/qcombobox.pro diff --git a/tests/auto/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp similarity index 100% rename from tests/auto/qcombobox/tst_qcombobox.cpp rename to tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp diff --git a/tests/auto/qcommandlinkbutton/.gitignore b/tests/auto/widgets/widgets/qcommandlinkbutton/.gitignore similarity index 100% rename from tests/auto/qcommandlinkbutton/.gitignore rename to tests/auto/widgets/widgets/qcommandlinkbutton/.gitignore diff --git a/tests/auto/qcommandlinkbutton/qcommandlinkbutton.pro b/tests/auto/widgets/widgets/qcommandlinkbutton/qcommandlinkbutton.pro similarity index 100% rename from tests/auto/qcommandlinkbutton/qcommandlinkbutton.pro rename to tests/auto/widgets/widgets/qcommandlinkbutton/qcommandlinkbutton.pro diff --git a/tests/auto/qcommandlinkbutton/tst_qcommandlinkbutton.cpp b/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp similarity index 100% rename from tests/auto/qcommandlinkbutton/tst_qcommandlinkbutton.cpp rename to tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp diff --git a/tests/auto/qdatetimeedit/.gitignore b/tests/auto/widgets/widgets/qdatetimeedit/.gitignore similarity index 100% rename from tests/auto/qdatetimeedit/.gitignore rename to tests/auto/widgets/widgets/qdatetimeedit/.gitignore diff --git a/tests/auto/qdatetimeedit/qdatetimeedit.pro b/tests/auto/widgets/widgets/qdatetimeedit/qdatetimeedit.pro similarity index 100% rename from tests/auto/qdatetimeedit/qdatetimeedit.pro rename to tests/auto/widgets/widgets/qdatetimeedit/qdatetimeedit.pro diff --git a/tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp similarity index 100% rename from tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp rename to tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp diff --git a/tests/auto/qdial/.gitignore b/tests/auto/widgets/widgets/qdial/.gitignore similarity index 100% rename from tests/auto/qdial/.gitignore rename to tests/auto/widgets/widgets/qdial/.gitignore diff --git a/tests/auto/qdial/qdial.pro b/tests/auto/widgets/widgets/qdial/qdial.pro similarity index 100% rename from tests/auto/qdial/qdial.pro rename to tests/auto/widgets/widgets/qdial/qdial.pro diff --git a/tests/auto/qdial/tst_qdial.cpp b/tests/auto/widgets/widgets/qdial/tst_qdial.cpp similarity index 100% rename from tests/auto/qdial/tst_qdial.cpp rename to tests/auto/widgets/widgets/qdial/tst_qdial.cpp diff --git a/tests/auto/qdialogbuttonbox/.gitignore b/tests/auto/widgets/widgets/qdialogbuttonbox/.gitignore similarity index 100% rename from tests/auto/qdialogbuttonbox/.gitignore rename to tests/auto/widgets/widgets/qdialogbuttonbox/.gitignore diff --git a/tests/auto/qdialogbuttonbox/qdialogbuttonbox.pro b/tests/auto/widgets/widgets/qdialogbuttonbox/qdialogbuttonbox.pro similarity index 100% rename from tests/auto/qdialogbuttonbox/qdialogbuttonbox.pro rename to tests/auto/widgets/widgets/qdialogbuttonbox/qdialogbuttonbox.pro diff --git a/tests/auto/qdialogbuttonbox/tst_qdialogbuttonbox.cpp b/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp similarity index 100% rename from tests/auto/qdialogbuttonbox/tst_qdialogbuttonbox.cpp rename to tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp diff --git a/tests/auto/qdockwidget/.gitignore b/tests/auto/widgets/widgets/qdockwidget/.gitignore similarity index 100% rename from tests/auto/qdockwidget/.gitignore rename to tests/auto/widgets/widgets/qdockwidget/.gitignore diff --git a/tests/auto/qdockwidget/qdockwidget.pro b/tests/auto/widgets/widgets/qdockwidget/qdockwidget.pro similarity index 100% rename from tests/auto/qdockwidget/qdockwidget.pro rename to tests/auto/widgets/widgets/qdockwidget/qdockwidget.pro diff --git a/tests/auto/qdockwidget/tst_qdockwidget.cpp b/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp similarity index 100% rename from tests/auto/qdockwidget/tst_qdockwidget.cpp rename to tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp diff --git a/tests/auto/qdoublespinbox/.gitignore b/tests/auto/widgets/widgets/qdoublespinbox/.gitignore similarity index 100% rename from tests/auto/qdoublespinbox/.gitignore rename to tests/auto/widgets/widgets/qdoublespinbox/.gitignore diff --git a/tests/auto/qdoublespinbox/qdoublespinbox.pro b/tests/auto/widgets/widgets/qdoublespinbox/qdoublespinbox.pro similarity index 100% rename from tests/auto/qdoublespinbox/qdoublespinbox.pro rename to tests/auto/widgets/widgets/qdoublespinbox/qdoublespinbox.pro diff --git a/tests/auto/qdoublespinbox/tst_qdoublespinbox.cpp b/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp similarity index 100% rename from tests/auto/qdoublespinbox/tst_qdoublespinbox.cpp rename to tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp diff --git a/tests/auto/qdoublevalidator/.gitignore b/tests/auto/widgets/widgets/qdoublevalidator/.gitignore similarity index 100% rename from tests/auto/qdoublevalidator/.gitignore rename to tests/auto/widgets/widgets/qdoublevalidator/.gitignore diff --git a/tests/auto/qdoublevalidator/qdoublevalidator.pro b/tests/auto/widgets/widgets/qdoublevalidator/qdoublevalidator.pro similarity index 100% rename from tests/auto/qdoublevalidator/qdoublevalidator.pro rename to tests/auto/widgets/widgets/qdoublevalidator/qdoublevalidator.pro diff --git a/tests/auto/qdoublevalidator/tst_qdoublevalidator.cpp b/tests/auto/widgets/widgets/qdoublevalidator/tst_qdoublevalidator.cpp similarity index 100% rename from tests/auto/qdoublevalidator/tst_qdoublevalidator.cpp rename to tests/auto/widgets/widgets/qdoublevalidator/tst_qdoublevalidator.cpp diff --git a/tests/auto/qfocusframe/.gitignore b/tests/auto/widgets/widgets/qfocusframe/.gitignore similarity index 100% rename from tests/auto/qfocusframe/.gitignore rename to tests/auto/widgets/widgets/qfocusframe/.gitignore diff --git a/tests/auto/qfocusframe/qfocusframe.pro b/tests/auto/widgets/widgets/qfocusframe/qfocusframe.pro similarity index 100% rename from tests/auto/qfocusframe/qfocusframe.pro rename to tests/auto/widgets/widgets/qfocusframe/qfocusframe.pro diff --git a/tests/auto/qfocusframe/tst_qfocusframe.cpp b/tests/auto/widgets/widgets/qfocusframe/tst_qfocusframe.cpp similarity index 100% rename from tests/auto/qfocusframe/tst_qfocusframe.cpp rename to tests/auto/widgets/widgets/qfocusframe/tst_qfocusframe.cpp diff --git a/tests/auto/qfontcombobox/.gitignore b/tests/auto/widgets/widgets/qfontcombobox/.gitignore similarity index 100% rename from tests/auto/qfontcombobox/.gitignore rename to tests/auto/widgets/widgets/qfontcombobox/.gitignore diff --git a/tests/auto/qfontcombobox/qfontcombobox.pro b/tests/auto/widgets/widgets/qfontcombobox/qfontcombobox.pro similarity index 100% rename from tests/auto/qfontcombobox/qfontcombobox.pro rename to tests/auto/widgets/widgets/qfontcombobox/qfontcombobox.pro diff --git a/tests/auto/qfontcombobox/tst_qfontcombobox.cpp b/tests/auto/widgets/widgets/qfontcombobox/tst_qfontcombobox.cpp similarity index 100% rename from tests/auto/qfontcombobox/tst_qfontcombobox.cpp rename to tests/auto/widgets/widgets/qfontcombobox/tst_qfontcombobox.cpp diff --git a/tests/auto/qgroupbox/.gitignore b/tests/auto/widgets/widgets/qgroupbox/.gitignore similarity index 100% rename from tests/auto/qgroupbox/.gitignore rename to tests/auto/widgets/widgets/qgroupbox/.gitignore diff --git a/tests/auto/qgroupbox/qgroupbox.pro b/tests/auto/widgets/widgets/qgroupbox/qgroupbox.pro similarity index 100% rename from tests/auto/qgroupbox/qgroupbox.pro rename to tests/auto/widgets/widgets/qgroupbox/qgroupbox.pro diff --git a/tests/auto/qgroupbox/tst_qgroupbox.cpp b/tests/auto/widgets/widgets/qgroupbox/tst_qgroupbox.cpp similarity index 100% rename from tests/auto/qgroupbox/tst_qgroupbox.cpp rename to tests/auto/widgets/widgets/qgroupbox/tst_qgroupbox.cpp diff --git a/tests/auto/qintvalidator/.gitignore b/tests/auto/widgets/widgets/qintvalidator/.gitignore similarity index 100% rename from tests/auto/qintvalidator/.gitignore rename to tests/auto/widgets/widgets/qintvalidator/.gitignore diff --git a/tests/auto/qintvalidator/qintvalidator.pro b/tests/auto/widgets/widgets/qintvalidator/qintvalidator.pro similarity index 100% rename from tests/auto/qintvalidator/qintvalidator.pro rename to tests/auto/widgets/widgets/qintvalidator/qintvalidator.pro diff --git a/tests/auto/qintvalidator/tst_qintvalidator.cpp b/tests/auto/widgets/widgets/qintvalidator/tst_qintvalidator.cpp similarity index 100% rename from tests/auto/qintvalidator/tst_qintvalidator.cpp rename to tests/auto/widgets/widgets/qintvalidator/tst_qintvalidator.cpp diff --git a/tests/auto/qlabel/.gitignore b/tests/auto/widgets/widgets/qlabel/.gitignore similarity index 100% rename from tests/auto/qlabel/.gitignore rename to tests/auto/widgets/widgets/qlabel/.gitignore diff --git a/tests/auto/qlabel/green.png b/tests/auto/widgets/widgets/qlabel/green.png similarity index 100% rename from tests/auto/qlabel/green.png rename to tests/auto/widgets/widgets/qlabel/green.png diff --git a/tests/auto/qlabel/qlabel.pro b/tests/auto/widgets/widgets/qlabel/qlabel.pro similarity index 100% rename from tests/auto/qlabel/qlabel.pro rename to tests/auto/widgets/widgets/qlabel/qlabel.pro diff --git a/tests/auto/qlabel/red.png b/tests/auto/widgets/widgets/qlabel/red.png similarity index 100% rename from tests/auto/qlabel/red.png rename to tests/auto/widgets/widgets/qlabel/red.png diff --git a/tests/auto/qlabel/testdata/acc_01/res_Windows_data0.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/acc_01/res_Windows_data0.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/acc_01/res_Windows_data0.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/acc_01/res_Windows_data0.qsnap diff --git a/tests/auto/qlabel/testdata/acc_01/res_Windows_win32_data0.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/acc_01/res_Windows_win32_data0.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/acc_01/res_Windows_win32_data0.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/acc_01/res_Windows_win32_data0.qsnap diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data0.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data0.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data0.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data0.qsnap diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data1.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data1.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data1.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data1.qsnap diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data10.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data10.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data10.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data10.qsnap diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data2.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data2.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data2.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data2.qsnap diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data3.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data3.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data3.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data3.qsnap diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data4.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data4.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data4.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data4.qsnap diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data5.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data5.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data5.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data5.qsnap diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data6.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data6.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data6.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data6.qsnap diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data7.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data7.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data7.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data7.qsnap diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data8.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data8.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data8.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data8.qsnap diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data9.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data9.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data9.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data9.qsnap diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data0.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data0.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data0.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data0.qsnap diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data1.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data1.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data1.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data1.qsnap diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data10.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data10.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data10.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data10.qsnap diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data2.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data2.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data2.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data2.qsnap diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data3.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data3.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data3.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data3.qsnap diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data4.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data4.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data4.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data4.qsnap diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data5.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data5.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data5.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data5.qsnap diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data6.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data6.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data6.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data6.qsnap diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data7.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data7.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data7.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data7.qsnap diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data8.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data8.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data8.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data8.qsnap diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data9.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data9.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data9.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data9.qsnap diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data0.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data0.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data0.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data0.qsnap diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data1.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data1.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data1.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data1.qsnap diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data10.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data10.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data10.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data10.qsnap diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data2.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data2.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data2.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data2.qsnap diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data3.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data3.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data3.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data3.qsnap diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data4.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data4.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data4.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data4.qsnap diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data5.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data5.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data5.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data5.qsnap diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data6.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data6.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data6.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data6.qsnap diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data7.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data7.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data7.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data7.qsnap diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data8.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data8.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data8.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data8.qsnap diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data9.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data9.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data9.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data9.qsnap diff --git a/tests/auto/qlabel/testdata/setIndent/indentRes_Motif_data0.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setIndent/indentRes_Motif_data0.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setIndent/indentRes_Motif_data0.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setIndent/indentRes_Motif_data0.qsnap diff --git a/tests/auto/qlabel/testdata/setIndent/indentRes_Motif_data1.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setIndent/indentRes_Motif_data1.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setIndent/indentRes_Motif_data1.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setIndent/indentRes_Motif_data1.qsnap diff --git a/tests/auto/qlabel/testdata/setIndent/indentRes_Motif_data2.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setIndent/indentRes_Motif_data2.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setIndent/indentRes_Motif_data2.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setIndent/indentRes_Motif_data2.qsnap diff --git a/tests/auto/qlabel/testdata/setIndent/indentRes_Windows_data0.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setIndent/indentRes_Windows_data0.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setIndent/indentRes_Windows_data0.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setIndent/indentRes_Windows_data0.qsnap diff --git a/tests/auto/qlabel/testdata/setIndent/indentRes_Windows_data1.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setIndent/indentRes_Windows_data1.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setIndent/indentRes_Windows_data1.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setIndent/indentRes_Windows_data1.qsnap diff --git a/tests/auto/qlabel/testdata/setIndent/indentRes_Windows_data2.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setIndent/indentRes_Windows_data2.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setIndent/indentRes_Windows_data2.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setIndent/indentRes_Windows_data2.qsnap diff --git a/tests/auto/qlabel/testdata/setIndent/indentRes_Windows_win32_data0.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setIndent/indentRes_Windows_win32_data0.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setIndent/indentRes_Windows_win32_data0.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setIndent/indentRes_Windows_win32_data0.qsnap diff --git a/tests/auto/qlabel/testdata/setIndent/indentRes_Windows_win32_data1.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setIndent/indentRes_Windows_win32_data1.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setIndent/indentRes_Windows_win32_data1.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setIndent/indentRes_Windows_win32_data1.qsnap diff --git a/tests/auto/qlabel/testdata/setIndent/indentRes_Windows_win32_data2.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setIndent/indentRes_Windows_win32_data2.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setIndent/indentRes_Windows_win32_data2.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setIndent/indentRes_Windows_win32_data2.qsnap diff --git a/tests/auto/qlabel/testdata/setPixmap/Vpix_Motif_data0.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setPixmap/Vpix_Motif_data0.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setPixmap/Vpix_Motif_data0.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setPixmap/Vpix_Motif_data0.qsnap diff --git a/tests/auto/qlabel/testdata/setPixmap/Vpix_Windows_data0.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setPixmap/Vpix_Windows_data0.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setPixmap/Vpix_Windows_data0.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setPixmap/Vpix_Windows_data0.qsnap diff --git a/tests/auto/qlabel/testdata/setPixmap/Vpix_Windows_win32_data0.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setPixmap/Vpix_Windows_win32_data0.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setPixmap/Vpix_Windows_win32_data0.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setPixmap/Vpix_Windows_win32_data0.qsnap diff --git a/tests/auto/qlabel/testdata/setPixmap/empty_Motif_data0.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setPixmap/empty_Motif_data0.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setPixmap/empty_Motif_data0.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setPixmap/empty_Motif_data0.qsnap diff --git a/tests/auto/qlabel/testdata/setPixmap/empty_Windows_data0.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setPixmap/empty_Windows_data0.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setPixmap/empty_Windows_data0.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setPixmap/empty_Windows_data0.qsnap diff --git a/tests/auto/qlabel/testdata/setPixmap/empty_Windows_win32_data0.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setPixmap/empty_Windows_win32_data0.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setPixmap/empty_Windows_win32_data0.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setPixmap/empty_Windows_win32_data0.qsnap diff --git a/tests/auto/qlabel/testdata/setPixmap/scaledVpix_Motif_data0.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setPixmap/scaledVpix_Motif_data0.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setPixmap/scaledVpix_Motif_data0.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setPixmap/scaledVpix_Motif_data0.qsnap diff --git a/tests/auto/qlabel/testdata/setPixmap/scaledVpix_Windows_data0.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setPixmap/scaledVpix_Windows_data0.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setPixmap/scaledVpix_Windows_data0.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setPixmap/scaledVpix_Windows_data0.qsnap diff --git a/tests/auto/qlabel/testdata/setPixmap/scaledVpix_Windows_win32_data0.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setPixmap/scaledVpix_Windows_win32_data0.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setPixmap/scaledVpix_Windows_win32_data0.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setPixmap/scaledVpix_Windows_win32_data0.qsnap diff --git a/tests/auto/qlabel/testdata/setText/res_Motif_data0.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setText/res_Motif_data0.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setText/res_Motif_data0.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setText/res_Motif_data0.qsnap diff --git a/tests/auto/qlabel/testdata/setText/res_Motif_data1.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setText/res_Motif_data1.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setText/res_Motif_data1.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setText/res_Motif_data1.qsnap diff --git a/tests/auto/qlabel/testdata/setText/res_Motif_data2.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setText/res_Motif_data2.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setText/res_Motif_data2.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setText/res_Motif_data2.qsnap diff --git a/tests/auto/qlabel/testdata/setText/res_Motif_data3.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setText/res_Motif_data3.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setText/res_Motif_data3.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setText/res_Motif_data3.qsnap diff --git a/tests/auto/qlabel/testdata/setText/res_Windows_data0.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setText/res_Windows_data0.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setText/res_Windows_data0.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setText/res_Windows_data0.qsnap diff --git a/tests/auto/qlabel/testdata/setText/res_Windows_data1.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setText/res_Windows_data1.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setText/res_Windows_data1.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setText/res_Windows_data1.qsnap diff --git a/tests/auto/qlabel/testdata/setText/res_Windows_data2.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setText/res_Windows_data2.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setText/res_Windows_data2.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setText/res_Windows_data2.qsnap diff --git a/tests/auto/qlabel/testdata/setText/res_Windows_data3.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setText/res_Windows_data3.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setText/res_Windows_data3.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setText/res_Windows_data3.qsnap diff --git a/tests/auto/qlabel/testdata/setText/res_Windows_win32_data0.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setText/res_Windows_win32_data0.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setText/res_Windows_win32_data0.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setText/res_Windows_win32_data0.qsnap diff --git a/tests/auto/qlabel/testdata/setText/res_Windows_win32_data1.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setText/res_Windows_win32_data1.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setText/res_Windows_win32_data1.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setText/res_Windows_win32_data1.qsnap diff --git a/tests/auto/qlabel/testdata/setText/res_Windows_win32_data2.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setText/res_Windows_win32_data2.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setText/res_Windows_win32_data2.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setText/res_Windows_win32_data2.qsnap diff --git a/tests/auto/qlabel/testdata/setText/res_Windows_win32_data3.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setText/res_Windows_win32_data3.qsnap similarity index 100% rename from tests/auto/qlabel/testdata/setText/res_Windows_win32_data3.qsnap rename to tests/auto/widgets/widgets/qlabel/testdata/setText/res_Windows_win32_data3.qsnap diff --git a/tests/auto/qlabel/tst_qlabel.cpp b/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp similarity index 100% rename from tests/auto/qlabel/tst_qlabel.cpp rename to tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp diff --git a/tests/auto/qlcdnumber/.gitignore b/tests/auto/widgets/widgets/qlcdnumber/.gitignore similarity index 100% rename from tests/auto/qlcdnumber/.gitignore rename to tests/auto/widgets/widgets/qlcdnumber/.gitignore diff --git a/tests/auto/qlcdnumber/qlcdnumber.pro b/tests/auto/widgets/widgets/qlcdnumber/qlcdnumber.pro similarity index 100% rename from tests/auto/qlcdnumber/qlcdnumber.pro rename to tests/auto/widgets/widgets/qlcdnumber/qlcdnumber.pro diff --git a/tests/auto/qlcdnumber/tst_qlcdnumber.cpp b/tests/auto/widgets/widgets/qlcdnumber/tst_qlcdnumber.cpp similarity index 100% rename from tests/auto/qlcdnumber/tst_qlcdnumber.cpp rename to tests/auto/widgets/widgets/qlcdnumber/tst_qlcdnumber.cpp diff --git a/tests/auto/qlineedit/.gitignore b/tests/auto/widgets/widgets/qlineedit/.gitignore similarity index 100% rename from tests/auto/qlineedit/.gitignore rename to tests/auto/widgets/widgets/qlineedit/.gitignore diff --git a/tests/auto/qlineedit/qlineedit.pro b/tests/auto/widgets/widgets/qlineedit/qlineedit.pro similarity index 100% rename from tests/auto/qlineedit/qlineedit.pro rename to tests/auto/widgets/widgets/qlineedit/qlineedit.pro diff --git a/tests/auto/qlineedit/testdata/frame/noFrame_Motif-32x96x96_win.png b/tests/auto/widgets/widgets/qlineedit/testdata/frame/noFrame_Motif-32x96x96_win.png similarity index 100% rename from tests/auto/qlineedit/testdata/frame/noFrame_Motif-32x96x96_win.png rename to tests/auto/widgets/widgets/qlineedit/testdata/frame/noFrame_Motif-32x96x96_win.png diff --git a/tests/auto/qlineedit/testdata/frame/noFrame_Windows-32x96x96_win.png b/tests/auto/widgets/widgets/qlineedit/testdata/frame/noFrame_Windows-32x96x96_win.png similarity index 100% rename from tests/auto/qlineedit/testdata/frame/noFrame_Windows-32x96x96_win.png rename to tests/auto/widgets/widgets/qlineedit/testdata/frame/noFrame_Windows-32x96x96_win.png diff --git a/tests/auto/qlineedit/testdata/frame/useFrame_Motif-32x96x96_win.png b/tests/auto/widgets/widgets/qlineedit/testdata/frame/useFrame_Motif-32x96x96_win.png similarity index 100% rename from tests/auto/qlineedit/testdata/frame/useFrame_Motif-32x96x96_win.png rename to tests/auto/widgets/widgets/qlineedit/testdata/frame/useFrame_Motif-32x96x96_win.png diff --git a/tests/auto/qlineedit/testdata/frame/useFrame_Windows-32x96x96_win.png b/tests/auto/widgets/widgets/qlineedit/testdata/frame/useFrame_Windows-32x96x96_win.png similarity index 100% rename from tests/auto/qlineedit/testdata/frame/useFrame_Windows-32x96x96_win.png rename to tests/auto/widgets/widgets/qlineedit/testdata/frame/useFrame_Windows-32x96x96_win.png diff --git a/tests/auto/qlineedit/testdata/setAlignment/auto_Motif-32x96x96_win.png b/tests/auto/widgets/widgets/qlineedit/testdata/setAlignment/auto_Motif-32x96x96_win.png similarity index 100% rename from tests/auto/qlineedit/testdata/setAlignment/auto_Motif-32x96x96_win.png rename to tests/auto/widgets/widgets/qlineedit/testdata/setAlignment/auto_Motif-32x96x96_win.png diff --git a/tests/auto/qlineedit/testdata/setAlignment/auto_Windows-32x96x96_win.png b/tests/auto/widgets/widgets/qlineedit/testdata/setAlignment/auto_Windows-32x96x96_win.png similarity index 100% rename from tests/auto/qlineedit/testdata/setAlignment/auto_Windows-32x96x96_win.png rename to tests/auto/widgets/widgets/qlineedit/testdata/setAlignment/auto_Windows-32x96x96_win.png diff --git a/tests/auto/qlineedit/testdata/setAlignment/hcenter_Motif-32x96x96_win.png b/tests/auto/widgets/widgets/qlineedit/testdata/setAlignment/hcenter_Motif-32x96x96_win.png similarity index 100% rename from tests/auto/qlineedit/testdata/setAlignment/hcenter_Motif-32x96x96_win.png rename to tests/auto/widgets/widgets/qlineedit/testdata/setAlignment/hcenter_Motif-32x96x96_win.png diff --git a/tests/auto/qlineedit/testdata/setAlignment/hcenter_Windows-32x96x96_win.png b/tests/auto/widgets/widgets/qlineedit/testdata/setAlignment/hcenter_Windows-32x96x96_win.png similarity index 100% rename from tests/auto/qlineedit/testdata/setAlignment/hcenter_Windows-32x96x96_win.png rename to tests/auto/widgets/widgets/qlineedit/testdata/setAlignment/hcenter_Windows-32x96x96_win.png diff --git a/tests/auto/qlineedit/testdata/setAlignment/left_Motif-32x96x96_win.png b/tests/auto/widgets/widgets/qlineedit/testdata/setAlignment/left_Motif-32x96x96_win.png similarity index 100% rename from tests/auto/qlineedit/testdata/setAlignment/left_Motif-32x96x96_win.png rename to tests/auto/widgets/widgets/qlineedit/testdata/setAlignment/left_Motif-32x96x96_win.png diff --git a/tests/auto/qlineedit/testdata/setAlignment/left_Windows-32x96x96_win.png b/tests/auto/widgets/widgets/qlineedit/testdata/setAlignment/left_Windows-32x96x96_win.png similarity index 100% rename from tests/auto/qlineedit/testdata/setAlignment/left_Windows-32x96x96_win.png rename to tests/auto/widgets/widgets/qlineedit/testdata/setAlignment/left_Windows-32x96x96_win.png diff --git a/tests/auto/qlineedit/testdata/setAlignment/right_Motif-32x96x96_win.png b/tests/auto/widgets/widgets/qlineedit/testdata/setAlignment/right_Motif-32x96x96_win.png similarity index 100% rename from tests/auto/qlineedit/testdata/setAlignment/right_Motif-32x96x96_win.png rename to tests/auto/widgets/widgets/qlineedit/testdata/setAlignment/right_Motif-32x96x96_win.png diff --git a/tests/auto/qlineedit/testdata/setAlignment/right_Windows-32x96x96_win.png b/tests/auto/widgets/widgets/qlineedit/testdata/setAlignment/right_Windows-32x96x96_win.png similarity index 100% rename from tests/auto/qlineedit/testdata/setAlignment/right_Windows-32x96x96_win.png rename to tests/auto/widgets/widgets/qlineedit/testdata/setAlignment/right_Windows-32x96x96_win.png diff --git a/tests/auto/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp similarity index 100% rename from tests/auto/qlineedit/tst_qlineedit.cpp rename to tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp diff --git a/tests/auto/qmainwindow/.gitignore b/tests/auto/widgets/widgets/qmainwindow/.gitignore similarity index 100% rename from tests/auto/qmainwindow/.gitignore rename to tests/auto/widgets/widgets/qmainwindow/.gitignore diff --git a/tests/auto/qmainwindow/qmainwindow.pro b/tests/auto/widgets/widgets/qmainwindow/qmainwindow.pro similarity index 100% rename from tests/auto/qmainwindow/qmainwindow.pro rename to tests/auto/widgets/widgets/qmainwindow/qmainwindow.pro diff --git a/tests/auto/qmainwindow/tst_qmainwindow.cpp b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp similarity index 99% rename from tests/auto/qmainwindow/tst_qmainwindow.cpp rename to tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp index d6a8ae793d7..9722a3194b2 100644 --- a/tests/auto/qmainwindow/tst_qmainwindow.cpp +++ b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp @@ -55,7 +55,7 @@ #include #include #include -#include "../platformquirks.h" +#include "../../../platformquirks.h" //TESTED_FILES= diff --git a/tests/auto/qmdiarea/.gitignore b/tests/auto/widgets/widgets/qmdiarea/.gitignore similarity index 100% rename from tests/auto/qmdiarea/.gitignore rename to tests/auto/widgets/widgets/qmdiarea/.gitignore diff --git a/tests/auto/qmdiarea/qmdiarea.pro b/tests/auto/widgets/widgets/qmdiarea/qmdiarea.pro similarity index 100% rename from tests/auto/qmdiarea/qmdiarea.pro rename to tests/auto/widgets/widgets/qmdiarea/qmdiarea.pro diff --git a/tests/auto/qmdiarea/tst_qmdiarea.cpp b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp similarity index 99% rename from tests/auto/qmdiarea/tst_qmdiarea.cpp rename to tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp index bbc3d27e270..a4ce94cc3db 100644 --- a/tests/auto/qmdiarea/tst_qmdiarea.cpp +++ b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp @@ -62,7 +62,7 @@ #endif #include -#include "../platformquirks.h" +#include "../../../platformquirks.h" static const Qt::WindowFlags DefaultWindowFlags = Qt::SubWindow | Qt::WindowSystemMenuHint diff --git a/tests/auto/qmdisubwindow/.gitignore b/tests/auto/widgets/widgets/qmdisubwindow/.gitignore similarity index 100% rename from tests/auto/qmdisubwindow/.gitignore rename to tests/auto/widgets/widgets/qmdisubwindow/.gitignore diff --git a/tests/auto/qmdisubwindow/qmdisubwindow.pro b/tests/auto/widgets/widgets/qmdisubwindow/qmdisubwindow.pro similarity index 100% rename from tests/auto/qmdisubwindow/qmdisubwindow.pro rename to tests/auto/widgets/widgets/qmdisubwindow/qmdisubwindow.pro diff --git a/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp similarity index 100% rename from tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp rename to tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp diff --git a/tests/auto/qmenu/.gitignore b/tests/auto/widgets/widgets/qmenu/.gitignore similarity index 100% rename from tests/auto/qmenu/.gitignore rename to tests/auto/widgets/widgets/qmenu/.gitignore diff --git a/tests/auto/qmenu/qmenu.pro b/tests/auto/widgets/widgets/qmenu/qmenu.pro similarity index 100% rename from tests/auto/qmenu/qmenu.pro rename to tests/auto/widgets/widgets/qmenu/qmenu.pro diff --git a/tests/auto/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp similarity index 100% rename from tests/auto/qmenu/tst_qmenu.cpp rename to tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp diff --git a/tests/auto/qmenubar/.gitignore b/tests/auto/widgets/widgets/qmenubar/.gitignore similarity index 100% rename from tests/auto/qmenubar/.gitignore rename to tests/auto/widgets/widgets/qmenubar/.gitignore diff --git a/tests/auto/qmenubar/qmenubar.pro b/tests/auto/widgets/widgets/qmenubar/qmenubar.pro similarity index 100% rename from tests/auto/qmenubar/qmenubar.pro rename to tests/auto/widgets/widgets/qmenubar/qmenubar.pro diff --git a/tests/auto/qmenubar/tst_qmenubar.cpp b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp similarity index 100% rename from tests/auto/qmenubar/tst_qmenubar.cpp rename to tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp diff --git a/tests/auto/qplaintextedit/.gitignore b/tests/auto/widgets/widgets/qplaintextedit/.gitignore similarity index 100% rename from tests/auto/qplaintextedit/.gitignore rename to tests/auto/widgets/widgets/qplaintextedit/.gitignore diff --git a/tests/auto/qplaintextedit/qplaintextedit.pro b/tests/auto/widgets/widgets/qplaintextedit/qplaintextedit.pro similarity index 100% rename from tests/auto/qplaintextedit/qplaintextedit.pro rename to tests/auto/widgets/widgets/qplaintextedit/qplaintextedit.pro diff --git a/tests/auto/qplaintextedit/tst_qplaintextedit.cpp b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp similarity index 100% rename from tests/auto/qplaintextedit/tst_qplaintextedit.cpp rename to tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp diff --git a/tests/auto/qprogressbar/.gitignore b/tests/auto/widgets/widgets/qprogressbar/.gitignore similarity index 100% rename from tests/auto/qprogressbar/.gitignore rename to tests/auto/widgets/widgets/qprogressbar/.gitignore diff --git a/tests/auto/qprogressbar/qprogressbar.pro b/tests/auto/widgets/widgets/qprogressbar/qprogressbar.pro similarity index 100% rename from tests/auto/qprogressbar/qprogressbar.pro rename to tests/auto/widgets/widgets/qprogressbar/qprogressbar.pro diff --git a/tests/auto/qprogressbar/tst_qprogressbar.cpp b/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp similarity index 100% rename from tests/auto/qprogressbar/tst_qprogressbar.cpp rename to tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp diff --git a/tests/auto/qpushbutton/.gitignore b/tests/auto/widgets/widgets/qpushbutton/.gitignore similarity index 100% rename from tests/auto/qpushbutton/.gitignore rename to tests/auto/widgets/widgets/qpushbutton/.gitignore diff --git a/tests/auto/qpushbutton/qpushbutton.pro b/tests/auto/widgets/widgets/qpushbutton/qpushbutton.pro similarity index 100% rename from tests/auto/qpushbutton/qpushbutton.pro rename to tests/auto/widgets/widgets/qpushbutton/qpushbutton.pro diff --git a/tests/auto/qpushbutton/testdata/setEnabled/disabled_Windows_win32_data0.qsnap b/tests/auto/widgets/widgets/qpushbutton/testdata/setEnabled/disabled_Windows_win32_data0.qsnap similarity index 100% rename from tests/auto/qpushbutton/testdata/setEnabled/disabled_Windows_win32_data0.qsnap rename to tests/auto/widgets/widgets/qpushbutton/testdata/setEnabled/disabled_Windows_win32_data0.qsnap diff --git a/tests/auto/qpushbutton/testdata/setEnabled/enabled_Motif_data0.qsnap b/tests/auto/widgets/widgets/qpushbutton/testdata/setEnabled/enabled_Motif_data0.qsnap similarity index 100% rename from tests/auto/qpushbutton/testdata/setEnabled/enabled_Motif_data0.qsnap rename to tests/auto/widgets/widgets/qpushbutton/testdata/setEnabled/enabled_Motif_data0.qsnap diff --git a/tests/auto/qpushbutton/testdata/setEnabled/enabled_Windows_data0.qsnap b/tests/auto/widgets/widgets/qpushbutton/testdata/setEnabled/enabled_Windows_data0.qsnap similarity index 100% rename from tests/auto/qpushbutton/testdata/setEnabled/enabled_Windows_data0.qsnap rename to tests/auto/widgets/widgets/qpushbutton/testdata/setEnabled/enabled_Windows_data0.qsnap diff --git a/tests/auto/qpushbutton/testdata/setEnabled/enabled_Windows_win32_data0.qsnap b/tests/auto/widgets/widgets/qpushbutton/testdata/setEnabled/enabled_Windows_win32_data0.qsnap similarity index 100% rename from tests/auto/qpushbutton/testdata/setEnabled/enabled_Windows_win32_data0.qsnap rename to tests/auto/widgets/widgets/qpushbutton/testdata/setEnabled/enabled_Windows_win32_data0.qsnap diff --git a/tests/auto/qpushbutton/testdata/setPixmap/Vpix_Motif_data0.qsnap b/tests/auto/widgets/widgets/qpushbutton/testdata/setPixmap/Vpix_Motif_data0.qsnap similarity index 100% rename from tests/auto/qpushbutton/testdata/setPixmap/Vpix_Motif_data0.qsnap rename to tests/auto/widgets/widgets/qpushbutton/testdata/setPixmap/Vpix_Motif_data0.qsnap diff --git a/tests/auto/qpushbutton/testdata/setPixmap/Vpix_Windows_data0.qsnap b/tests/auto/widgets/widgets/qpushbutton/testdata/setPixmap/Vpix_Windows_data0.qsnap similarity index 100% rename from tests/auto/qpushbutton/testdata/setPixmap/Vpix_Windows_data0.qsnap rename to tests/auto/widgets/widgets/qpushbutton/testdata/setPixmap/Vpix_Windows_data0.qsnap diff --git a/tests/auto/qpushbutton/testdata/setPixmap/Vpix_Windows_win32_data0.qsnap b/tests/auto/widgets/widgets/qpushbutton/testdata/setPixmap/Vpix_Windows_win32_data0.qsnap similarity index 100% rename from tests/auto/qpushbutton/testdata/setPixmap/Vpix_Windows_win32_data0.qsnap rename to tests/auto/widgets/widgets/qpushbutton/testdata/setPixmap/Vpix_Windows_win32_data0.qsnap diff --git a/tests/auto/qpushbutton/testdata/setText/simple_Motif_data0.qsnap b/tests/auto/widgets/widgets/qpushbutton/testdata/setText/simple_Motif_data0.qsnap similarity index 100% rename from tests/auto/qpushbutton/testdata/setText/simple_Motif_data0.qsnap rename to tests/auto/widgets/widgets/qpushbutton/testdata/setText/simple_Motif_data0.qsnap diff --git a/tests/auto/qpushbutton/testdata/setText/simple_Windows_data0.qsnap b/tests/auto/widgets/widgets/qpushbutton/testdata/setText/simple_Windows_data0.qsnap similarity index 100% rename from tests/auto/qpushbutton/testdata/setText/simple_Windows_data0.qsnap rename to tests/auto/widgets/widgets/qpushbutton/testdata/setText/simple_Windows_data0.qsnap diff --git a/tests/auto/qpushbutton/testdata/setText/simple_Windows_win32_data0.qsnap b/tests/auto/widgets/widgets/qpushbutton/testdata/setText/simple_Windows_win32_data0.qsnap similarity index 100% rename from tests/auto/qpushbutton/testdata/setText/simple_Windows_win32_data0.qsnap rename to tests/auto/widgets/widgets/qpushbutton/testdata/setText/simple_Windows_win32_data0.qsnap diff --git a/tests/auto/qpushbutton/tst_qpushbutton.cpp b/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp similarity index 100% rename from tests/auto/qpushbutton/tst_qpushbutton.cpp rename to tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp diff --git a/tests/auto/qradiobutton/.gitignore b/tests/auto/widgets/widgets/qradiobutton/.gitignore similarity index 100% rename from tests/auto/qradiobutton/.gitignore rename to tests/auto/widgets/widgets/qradiobutton/.gitignore diff --git a/tests/auto/qradiobutton/qradiobutton.pro b/tests/auto/widgets/widgets/qradiobutton/qradiobutton.pro similarity index 100% rename from tests/auto/qradiobutton/qradiobutton.pro rename to tests/auto/widgets/widgets/qradiobutton/qradiobutton.pro diff --git a/tests/auto/qradiobutton/tst_qradiobutton.cpp b/tests/auto/widgets/widgets/qradiobutton/tst_qradiobutton.cpp similarity index 100% rename from tests/auto/qradiobutton/tst_qradiobutton.cpp rename to tests/auto/widgets/widgets/qradiobutton/tst_qradiobutton.cpp diff --git a/tests/auto/qregexpvalidator/.gitignore b/tests/auto/widgets/widgets/qregexpvalidator/.gitignore similarity index 100% rename from tests/auto/qregexpvalidator/.gitignore rename to tests/auto/widgets/widgets/qregexpvalidator/.gitignore diff --git a/tests/auto/qregexpvalidator/qregexpvalidator.pro b/tests/auto/widgets/widgets/qregexpvalidator/qregexpvalidator.pro similarity index 100% rename from tests/auto/qregexpvalidator/qregexpvalidator.pro rename to tests/auto/widgets/widgets/qregexpvalidator/qregexpvalidator.pro diff --git a/tests/auto/qregexpvalidator/tst_qregexpvalidator.cpp b/tests/auto/widgets/widgets/qregexpvalidator/tst_qregexpvalidator.cpp similarity index 100% rename from tests/auto/qregexpvalidator/tst_qregexpvalidator.cpp rename to tests/auto/widgets/widgets/qregexpvalidator/tst_qregexpvalidator.cpp diff --git a/tests/auto/qscrollarea/.gitignore b/tests/auto/widgets/widgets/qscrollarea/.gitignore similarity index 100% rename from tests/auto/qscrollarea/.gitignore rename to tests/auto/widgets/widgets/qscrollarea/.gitignore diff --git a/tests/auto/qscrollarea/qscrollarea.pro b/tests/auto/widgets/widgets/qscrollarea/qscrollarea.pro similarity index 100% rename from tests/auto/qscrollarea/qscrollarea.pro rename to tests/auto/widgets/widgets/qscrollarea/qscrollarea.pro diff --git a/tests/auto/qscrollarea/tst_qscrollarea.cpp b/tests/auto/widgets/widgets/qscrollarea/tst_qscrollarea.cpp similarity index 100% rename from tests/auto/qscrollarea/tst_qscrollarea.cpp rename to tests/auto/widgets/widgets/qscrollarea/tst_qscrollarea.cpp diff --git a/tests/auto/qscrollbar/.gitignore b/tests/auto/widgets/widgets/qscrollbar/.gitignore similarity index 100% rename from tests/auto/qscrollbar/.gitignore rename to tests/auto/widgets/widgets/qscrollbar/.gitignore diff --git a/tests/auto/qscrollbar/qscrollbar.pro b/tests/auto/widgets/widgets/qscrollbar/qscrollbar.pro similarity index 100% rename from tests/auto/qscrollbar/qscrollbar.pro rename to tests/auto/widgets/widgets/qscrollbar/qscrollbar.pro diff --git a/tests/auto/qscrollbar/tst_qscrollbar.cpp b/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp similarity index 100% rename from tests/auto/qscrollbar/tst_qscrollbar.cpp rename to tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp diff --git a/tests/auto/qsizegrip/.gitignore b/tests/auto/widgets/widgets/qsizegrip/.gitignore similarity index 100% rename from tests/auto/qsizegrip/.gitignore rename to tests/auto/widgets/widgets/qsizegrip/.gitignore diff --git a/tests/auto/qsizegrip/qsizegrip.pro b/tests/auto/widgets/widgets/qsizegrip/qsizegrip.pro similarity index 100% rename from tests/auto/qsizegrip/qsizegrip.pro rename to tests/auto/widgets/widgets/qsizegrip/qsizegrip.pro diff --git a/tests/auto/qsizegrip/tst_qsizegrip.cpp b/tests/auto/widgets/widgets/qsizegrip/tst_qsizegrip.cpp similarity index 100% rename from tests/auto/qsizegrip/tst_qsizegrip.cpp rename to tests/auto/widgets/widgets/qsizegrip/tst_qsizegrip.cpp diff --git a/tests/auto/qslider/.gitignore b/tests/auto/widgets/widgets/qslider/.gitignore similarity index 100% rename from tests/auto/qslider/.gitignore rename to tests/auto/widgets/widgets/qslider/.gitignore diff --git a/tests/auto/qslider/qslider.pro b/tests/auto/widgets/widgets/qslider/qslider.pro similarity index 100% rename from tests/auto/qslider/qslider.pro rename to tests/auto/widgets/widgets/qslider/qslider.pro diff --git a/tests/auto/qslider/tst_qslider.cpp b/tests/auto/widgets/widgets/qslider/tst_qslider.cpp similarity index 100% rename from tests/auto/qslider/tst_qslider.cpp rename to tests/auto/widgets/widgets/qslider/tst_qslider.cpp diff --git a/tests/auto/qspinbox/.gitignore b/tests/auto/widgets/widgets/qspinbox/.gitignore similarity index 100% rename from tests/auto/qspinbox/.gitignore rename to tests/auto/widgets/widgets/qspinbox/.gitignore diff --git a/tests/auto/qspinbox/qspinbox.pro b/tests/auto/widgets/widgets/qspinbox/qspinbox.pro similarity index 100% rename from tests/auto/qspinbox/qspinbox.pro rename to tests/auto/widgets/widgets/qspinbox/qspinbox.pro diff --git a/tests/auto/qspinbox/tst_qspinbox.cpp b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp similarity index 100% rename from tests/auto/qspinbox/tst_qspinbox.cpp rename to tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp diff --git a/tests/auto/qsplitter/.gitignore b/tests/auto/widgets/widgets/qsplitter/.gitignore similarity index 100% rename from tests/auto/qsplitter/.gitignore rename to tests/auto/widgets/widgets/qsplitter/.gitignore diff --git a/tests/auto/qsplitter/extradata.txt b/tests/auto/widgets/widgets/qsplitter/extradata.txt similarity index 100% rename from tests/auto/qsplitter/extradata.txt rename to tests/auto/widgets/widgets/qsplitter/extradata.txt diff --git a/tests/auto/qsplitter/qsplitter.pro b/tests/auto/widgets/widgets/qsplitter/qsplitter.pro similarity index 100% rename from tests/auto/qsplitter/qsplitter.pro rename to tests/auto/widgets/widgets/qsplitter/qsplitter.pro diff --git a/tests/auto/qsplitter/setSizes3.dat b/tests/auto/widgets/widgets/qsplitter/setSizes3.dat similarity index 100% rename from tests/auto/qsplitter/setSizes3.dat rename to tests/auto/widgets/widgets/qsplitter/setSizes3.dat diff --git a/tests/auto/qsplitter/tst_qsplitter.cpp b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp similarity index 100% rename from tests/auto/qsplitter/tst_qsplitter.cpp rename to tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp diff --git a/tests/auto/qstackedwidget/.gitignore b/tests/auto/widgets/widgets/qstackedwidget/.gitignore similarity index 100% rename from tests/auto/qstackedwidget/.gitignore rename to tests/auto/widgets/widgets/qstackedwidget/.gitignore diff --git a/tests/auto/qstackedwidget/qstackedwidget.pro b/tests/auto/widgets/widgets/qstackedwidget/qstackedwidget.pro similarity index 100% rename from tests/auto/qstackedwidget/qstackedwidget.pro rename to tests/auto/widgets/widgets/qstackedwidget/qstackedwidget.pro diff --git a/tests/auto/qstackedwidget/tst_qstackedwidget.cpp b/tests/auto/widgets/widgets/qstackedwidget/tst_qstackedwidget.cpp similarity index 100% rename from tests/auto/qstackedwidget/tst_qstackedwidget.cpp rename to tests/auto/widgets/widgets/qstackedwidget/tst_qstackedwidget.cpp diff --git a/tests/auto/qstatusbar/.gitignore b/tests/auto/widgets/widgets/qstatusbar/.gitignore similarity index 100% rename from tests/auto/qstatusbar/.gitignore rename to tests/auto/widgets/widgets/qstatusbar/.gitignore diff --git a/tests/auto/qstatusbar/qstatusbar.pro b/tests/auto/widgets/widgets/qstatusbar/qstatusbar.pro similarity index 100% rename from tests/auto/qstatusbar/qstatusbar.pro rename to tests/auto/widgets/widgets/qstatusbar/qstatusbar.pro diff --git a/tests/auto/qstatusbar/tst_qstatusbar.cpp b/tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp similarity index 100% rename from tests/auto/qstatusbar/tst_qstatusbar.cpp rename to tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp diff --git a/tests/auto/qtabbar/.gitignore b/tests/auto/widgets/widgets/qtabbar/.gitignore similarity index 100% rename from tests/auto/qtabbar/.gitignore rename to tests/auto/widgets/widgets/qtabbar/.gitignore diff --git a/tests/auto/qtabbar/qtabbar.pro b/tests/auto/widgets/widgets/qtabbar/qtabbar.pro similarity index 100% rename from tests/auto/qtabbar/qtabbar.pro rename to tests/auto/widgets/widgets/qtabbar/qtabbar.pro diff --git a/tests/auto/qtabbar/tst_qtabbar.cpp b/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp similarity index 100% rename from tests/auto/qtabbar/tst_qtabbar.cpp rename to tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp diff --git a/tests/auto/qtabwidget/.gitignore b/tests/auto/widgets/widgets/qtabwidget/.gitignore similarity index 100% rename from tests/auto/qtabwidget/.gitignore rename to tests/auto/widgets/widgets/qtabwidget/.gitignore diff --git a/tests/auto/qtabwidget/qtabwidget.pro b/tests/auto/widgets/widgets/qtabwidget/qtabwidget.pro similarity index 100% rename from tests/auto/qtabwidget/qtabwidget.pro rename to tests/auto/widgets/widgets/qtabwidget/qtabwidget.pro diff --git a/tests/auto/qtabwidget/tst_qtabwidget.cpp b/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp similarity index 100% rename from tests/auto/qtabwidget/tst_qtabwidget.cpp rename to tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp diff --git a/tests/auto/qtextbrowser/.gitignore b/tests/auto/widgets/widgets/qtextbrowser/.gitignore similarity index 100% rename from tests/auto/qtextbrowser/.gitignore rename to tests/auto/widgets/widgets/qtextbrowser/.gitignore diff --git a/tests/auto/qtextbrowser/anchor.html b/tests/auto/widgets/widgets/qtextbrowser/anchor.html similarity index 100% rename from tests/auto/qtextbrowser/anchor.html rename to tests/auto/widgets/widgets/qtextbrowser/anchor.html diff --git a/tests/auto/qtextbrowser/bigpage.html b/tests/auto/widgets/widgets/qtextbrowser/bigpage.html similarity index 100% rename from tests/auto/qtextbrowser/bigpage.html rename to tests/auto/widgets/widgets/qtextbrowser/bigpage.html diff --git a/tests/auto/qtextbrowser/firstpage.html b/tests/auto/widgets/widgets/qtextbrowser/firstpage.html similarity index 100% rename from tests/auto/qtextbrowser/firstpage.html rename to tests/auto/widgets/widgets/qtextbrowser/firstpage.html diff --git a/tests/auto/qtextbrowser/pagewithbg.html b/tests/auto/widgets/widgets/qtextbrowser/pagewithbg.html similarity index 100% rename from tests/auto/qtextbrowser/pagewithbg.html rename to tests/auto/widgets/widgets/qtextbrowser/pagewithbg.html diff --git a/tests/auto/qtextbrowser/pagewithimage.html b/tests/auto/widgets/widgets/qtextbrowser/pagewithimage.html similarity index 100% rename from tests/auto/qtextbrowser/pagewithimage.html rename to tests/auto/widgets/widgets/qtextbrowser/pagewithimage.html diff --git a/tests/auto/qtextbrowser/pagewithoutbg.html b/tests/auto/widgets/widgets/qtextbrowser/pagewithoutbg.html similarity index 100% rename from tests/auto/qtextbrowser/pagewithoutbg.html rename to tests/auto/widgets/widgets/qtextbrowser/pagewithoutbg.html diff --git a/tests/auto/qtextbrowser/qtextbrowser.pro b/tests/auto/widgets/widgets/qtextbrowser/qtextbrowser.pro similarity index 100% rename from tests/auto/qtextbrowser/qtextbrowser.pro rename to tests/auto/widgets/widgets/qtextbrowser/qtextbrowser.pro diff --git a/tests/auto/qtextbrowser/secondpage.html b/tests/auto/widgets/widgets/qtextbrowser/secondpage.html similarity index 100% rename from tests/auto/qtextbrowser/secondpage.html rename to tests/auto/widgets/widgets/qtextbrowser/secondpage.html diff --git a/tests/auto/qtextbrowser/subdir/index.html b/tests/auto/widgets/widgets/qtextbrowser/subdir/index.html similarity index 100% rename from tests/auto/qtextbrowser/subdir/index.html rename to tests/auto/widgets/widgets/qtextbrowser/subdir/index.html diff --git a/tests/auto/qtextbrowser/thirdpage.html b/tests/auto/widgets/widgets/qtextbrowser/thirdpage.html similarity index 100% rename from tests/auto/qtextbrowser/thirdpage.html rename to tests/auto/widgets/widgets/qtextbrowser/thirdpage.html diff --git a/tests/auto/qtextbrowser/tst_qtextbrowser.cpp b/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp similarity index 100% rename from tests/auto/qtextbrowser/tst_qtextbrowser.cpp rename to tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp diff --git a/tests/auto/qtextedit/.gitignore b/tests/auto/widgets/widgets/qtextedit/.gitignore similarity index 100% rename from tests/auto/qtextedit/.gitignore rename to tests/auto/widgets/widgets/qtextedit/.gitignore diff --git a/tests/auto/qtextedit/fullWidthSelection/centered-fully-selected.png b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/centered-fully-selected.png similarity index 100% rename from tests/auto/qtextedit/fullWidthSelection/centered-fully-selected.png rename to tests/auto/widgets/widgets/qtextedit/fullWidthSelection/centered-fully-selected.png diff --git a/tests/auto/qtextedit/fullWidthSelection/centered-partly-selected.png b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/centered-partly-selected.png similarity index 100% rename from tests/auto/qtextedit/fullWidthSelection/centered-partly-selected.png rename to tests/auto/widgets/widgets/qtextedit/fullWidthSelection/centered-partly-selected.png diff --git a/tests/auto/qtextedit/fullWidthSelection/last-char-on-line.png b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/last-char-on-line.png similarity index 100% rename from tests/auto/qtextedit/fullWidthSelection/last-char-on-line.png rename to tests/auto/widgets/widgets/qtextedit/fullWidthSelection/last-char-on-line.png diff --git a/tests/auto/qtextedit/fullWidthSelection/last-char-on-parag.png b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/last-char-on-parag.png similarity index 100% rename from tests/auto/qtextedit/fullWidthSelection/last-char-on-parag.png rename to tests/auto/widgets/widgets/qtextedit/fullWidthSelection/last-char-on-parag.png diff --git a/tests/auto/qtextedit/fullWidthSelection/multiple-full-width-lines.png b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/multiple-full-width-lines.png similarity index 100% rename from tests/auto/qtextedit/fullWidthSelection/multiple-full-width-lines.png rename to tests/auto/widgets/widgets/qtextedit/fullWidthSelection/multiple-full-width-lines.png diff --git a/tests/auto/qtextedit/fullWidthSelection/nowrap_long.png b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/nowrap_long.png similarity index 100% rename from tests/auto/qtextedit/fullWidthSelection/nowrap_long.png rename to tests/auto/widgets/widgets/qtextedit/fullWidthSelection/nowrap_long.png diff --git a/tests/auto/qtextedit/fullWidthSelection/single-full-width-line.png b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/single-full-width-line.png similarity index 100% rename from tests/auto/qtextedit/fullWidthSelection/single-full-width-line.png rename to tests/auto/widgets/widgets/qtextedit/fullWidthSelection/single-full-width-line.png diff --git a/tests/auto/qtextedit/qtextedit.pro b/tests/auto/widgets/widgets/qtextedit/qtextedit.pro similarity index 100% rename from tests/auto/qtextedit/qtextedit.pro rename to tests/auto/widgets/widgets/qtextedit/qtextedit.pro diff --git a/tests/auto/qtextedit/tst_qtextedit.cpp b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp similarity index 100% rename from tests/auto/qtextedit/tst_qtextedit.cpp rename to tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp diff --git a/tests/auto/qtoolbar/.gitignore b/tests/auto/widgets/widgets/qtoolbar/.gitignore similarity index 100% rename from tests/auto/qtoolbar/.gitignore rename to tests/auto/widgets/widgets/qtoolbar/.gitignore diff --git a/tests/auto/qtoolbar/qtoolbar.pro b/tests/auto/widgets/widgets/qtoolbar/qtoolbar.pro similarity index 100% rename from tests/auto/qtoolbar/qtoolbar.pro rename to tests/auto/widgets/widgets/qtoolbar/qtoolbar.pro diff --git a/tests/auto/qtoolbar/tst_qtoolbar.cpp b/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp similarity index 100% rename from tests/auto/qtoolbar/tst_qtoolbar.cpp rename to tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp diff --git a/tests/auto/qtoolbox/.gitignore b/tests/auto/widgets/widgets/qtoolbox/.gitignore similarity index 100% rename from tests/auto/qtoolbox/.gitignore rename to tests/auto/widgets/widgets/qtoolbox/.gitignore diff --git a/tests/auto/qtoolbox/qtoolbox.pro b/tests/auto/widgets/widgets/qtoolbox/qtoolbox.pro similarity index 100% rename from tests/auto/qtoolbox/qtoolbox.pro rename to tests/auto/widgets/widgets/qtoolbox/qtoolbox.pro diff --git a/tests/auto/qtoolbox/tst_qtoolbox.cpp b/tests/auto/widgets/widgets/qtoolbox/tst_qtoolbox.cpp similarity index 100% rename from tests/auto/qtoolbox/tst_qtoolbox.cpp rename to tests/auto/widgets/widgets/qtoolbox/tst_qtoolbox.cpp diff --git a/tests/auto/qtoolbutton/.gitignore b/tests/auto/widgets/widgets/qtoolbutton/.gitignore similarity index 100% rename from tests/auto/qtoolbutton/.gitignore rename to tests/auto/widgets/widgets/qtoolbutton/.gitignore diff --git a/tests/auto/qtoolbutton/qtoolbutton.pro b/tests/auto/widgets/widgets/qtoolbutton/qtoolbutton.pro similarity index 100% rename from tests/auto/qtoolbutton/qtoolbutton.pro rename to tests/auto/widgets/widgets/qtoolbutton/qtoolbutton.pro diff --git a/tests/auto/qtoolbutton/tst_qtoolbutton.cpp b/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp similarity index 100% rename from tests/auto/qtoolbutton/tst_qtoolbutton.cpp rename to tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp diff --git a/tests/auto/qworkspace/.gitignore b/tests/auto/widgets/widgets/qworkspace/.gitignore similarity index 100% rename from tests/auto/qworkspace/.gitignore rename to tests/auto/widgets/widgets/qworkspace/.gitignore diff --git a/tests/auto/qworkspace/qworkspace.pro b/tests/auto/widgets/widgets/qworkspace/qworkspace.pro similarity index 100% rename from tests/auto/qworkspace/qworkspace.pro rename to tests/auto/widgets/widgets/qworkspace/qworkspace.pro diff --git a/tests/auto/qworkspace/tst_qworkspace.cpp b/tests/auto/widgets/widgets/qworkspace/tst_qworkspace.cpp similarity index 100% rename from tests/auto/qworkspace/tst_qworkspace.cpp rename to tests/auto/widgets/widgets/qworkspace/tst_qworkspace.cpp diff --git a/tests/auto/widgets/widgets/widgets.pro b/tests/auto/widgets/widgets/widgets.pro new file mode 100644 index 00000000000..e77c311cdec --- /dev/null +++ b/tests/auto/widgets/widgets/widgets.pro @@ -0,0 +1,57 @@ +TEMPLATE=subdirs +SUBDIRS=\ + qabstractbutton \ + qabstractscrollarea \ + qabstractslider \ + qabstractspinbox \ + qbuttongroup \ + qcalendarwidget \ + qcheckbox \ + qcombobox \ + qcommandlinkbutton \ + qdatetimeedit \ + qdial \ + qdialogbuttonbox \ + qdockwidget \ + qdoublespinbox \ + qdoublevalidator \ + qfocusframe \ + qfontcombobox \ + qgroupbox \ + qintvalidator \ + qlabel \ + qlcdnumber \ + qlineedit \ + qmainwindow \ + qmdiarea \ + qmdisubwindow \ + qmenu \ + qmenubar \ + qplaintextedit \ + qprogressbar \ + qpushbutton \ + qradiobutton \ + qregexpvalidator \ + qscrollarea \ + qscrollbar \ + qsizegrip \ + qslider \ + qspinbox \ + qsplitter \ + qstackedwidget \ + qstatusbar \ + qtabbar \ + qtabwidget \ + qtextbrowser \ + qtextedit \ + qtoolbar \ + qtoolbox \ + qtoolbutton \ + qworkspace \ + +# The following tests depend on private API: +!contains(QT_CONFIG, private_tests): SUBDIRS -= \ + qcombobox \ + qmainwindow \ + qtextedit \ + qtoolbar \