Moved integrationtests/* into other/
Currently there seems to be no precise definition of what an integrationtest is in the context of Qt testing. To avoid confusion, the tests under integrationtests/ are moved into other/ (which is effectively where we keep tests that don't clearly fit into any other category). Tests can be moved back into an integrationtests/ directory at a later point, should an unambiguous definition be established. Change-Id: I3bb289be2dc2aca11b51a8ce8fcc5942f06d6c5c Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
@ -4,7 +4,6 @@ SUBDIRS += \
|
||||
corelib \
|
||||
dbus \
|
||||
gui \
|
||||
integrationtests \
|
||||
network \
|
||||
opengl \
|
||||
sql \
|
||||
|
@ -2,7 +2,7 @@ CONFIG += testcase
|
||||
TARGET = tst_qabstractitemmodel
|
||||
QT += widgets testlib
|
||||
|
||||
mtdir = ../../../integrationtests/modeltest
|
||||
mtdir = ../../../other/modeltest
|
||||
INCLUDEPATH += $$PWD/$${mtdir}
|
||||
SOURCES = tst_qabstractitemmodel.cpp $${mtdir}/dynamictreemodel.cpp $${mtdir}/modeltest.cpp
|
||||
HEADERS = $${mtdir}/dynamictreemodel.h $${mtdir}/modeltest.h
|
||||
|
@ -1,37 +0,0 @@
|
||||
TEMPLATE=subdirs
|
||||
SUBDIRS=\
|
||||
collections \
|
||||
exceptionsafety \
|
||||
exceptionsafety_objects \
|
||||
gestures \
|
||||
lancelot \
|
||||
languagechange \
|
||||
macgui \
|
||||
macnativeevents \
|
||||
macplist \
|
||||
modeltest \
|
||||
networkselftest \
|
||||
qaccessibility \
|
||||
qcomplextext \
|
||||
qdirectpainter \
|
||||
qfocusevent \
|
||||
qmultiscreen \
|
||||
qnetworkaccessmanager_and_qprogressdialog \
|
||||
qobjectrace \
|
||||
qsharedpointer_and_qwidget \
|
||||
windowsmobile \
|
||||
|
||||
wince*|!contains(QT_CONFIG, accessibility):SUBDIRS -= qaccessibility
|
||||
|
||||
!mac: SUBDIRS -= \
|
||||
macgui \
|
||||
macnativeevents \
|
||||
macplist
|
||||
|
||||
!embedded|wince*: SUBDIRS -= \
|
||||
qdirectpainter \
|
||||
qmultiscreen \
|
||||
|
||||
!linux*-g++*:SUBDIRS -= exceptionsafety_objects
|
||||
|
||||
mac: lancelot.CONFIG = no_check_target # QTBUG-22792
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.4 KiB |
Before Width: | Height: | Size: 169 B After Width: | Height: | Size: 169 B |
Before Width: | Height: | Size: 254 B After Width: | Height: | Size: 254 B |
Before Width: | Height: | Size: 182 B After Width: | Height: | Size: 182 B |
Before Width: | Height: | Size: 826 B After Width: | Height: | Size: 826 B |
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
Before Width: | Height: | Size: 7.8 KiB After Width: | Height: | Size: 7.8 KiB |
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 5.3 KiB |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 2.6 KiB |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
Before Width: | Height: | Size: 287 B After Width: | Height: | Size: 287 B |
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.4 KiB |
Before Width: | Height: | Size: 213 B After Width: | Height: | Size: 213 B |
Before Width: | Height: | Size: 216 B After Width: | Height: | Size: 216 B |
Before Width: | Height: | Size: 216 B After Width: | Height: | Size: 216 B |
Before Width: | Height: | Size: 205 B After Width: | Height: | Size: 205 B |
Before Width: | Height: | Size: 187 B After Width: | Height: | Size: 187 B |
Before Width: | Height: | Size: 166 KiB After Width: | Height: | Size: 166 KiB |
Before Width: | Height: | Size: 274 B After Width: | Height: | Size: 274 B |
Before Width: | Height: | Size: 319 B After Width: | Height: | Size: 319 B |
Before Width: | Height: | Size: 788 B After Width: | Height: | Size: 788 B |
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
Before Width: | Height: | Size: 607 B After Width: | Height: | Size: 607 B |
Before Width: | Height: | Size: 169 B After Width: | Height: | Size: 169 B |
Before Width: | Height: | Size: 4.6 KiB After Width: | Height: | Size: 4.6 KiB |
Before Width: | Height: | Size: 62 KiB After Width: | Height: | Size: 62 KiB |
Before Width: | Height: | Size: 426 B After Width: | Height: | Size: 426 B |