Moved tests into integrationtests/ and widgets/

Task-number: QTBUG-19013

Change-Id: Ibb776f5967c0645ce6d22ef7afdc40657c575461
Reviewed-by: Holger Ihrig <holger.ihrig@nokia.com>

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

tests/auto/corelib.pro

@@ -1,7 +1,5 @@
 TEMPLATE=subdirs
 SUBDIRS=\
    corelib \
-   collections \
-   exceptionsafety \
    qobjectrace \
    utf8

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

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
+SOURCES         += tst_qabstractitemmodel.cpp $${mtdir}/dynamictreemodel.cpp $${mtdir}/modeltest.cpp
-HEADERS         += ../../../modeltest/dynamictreemodel.h ../../../modeltest/modeltest.h
+HEADERS         += $${mtdir}/dynamictreemodel.h $${mtdir}/modeltest.h
-
-
-

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 \
-

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
+

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