summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib
diff options
context:
space:
mode:
authorJo Asplin <jo.asplin@nokia.com>2011-10-20 13:17:26 +0200
committerQt by Nokia <qt-info@nokia.com>2011-10-20 19:45:41 +0200
commit9f1aa866bda7678261f2f441d4cfd5bb524c2411 (patch)
tree5028f578122e7feb9200d571405494c73d96db89 /tests/auto/corelib
parent78d02e93aca5325fc5be9bfd275862795207abaa (diff)
Moved tests into integrationtests/ and widgets/
Task-number: QTBUG-19013 Change-Id: Ibb776f5967c0645ce6d22ef7afdc40657c575461 Reviewed-by: Holger Ihrig <holger.ihrig@nokia.com>
Diffstat (limited to 'tests/auto/corelib')
-rw-r--r--tests/auto/corelib/kernel/kernel.pro2
-rw-r--r--tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro10
2 files changed, 5 insertions, 7 deletions
diff --git a/tests/auto/corelib/kernel/kernel.pro b/tests/auto/corelib/kernel/kernel.pro
index 42fda6f300..552c94d35f 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 50730b371f..eee2222cda 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