95 files changed, 157 insertions, 32 deletions
diff --git a/tests/auto/corelib.pro b/tests/auto/corelib.pro
index da2089b66b..8da834d111 100644
--- a/tests/auto/corelib.pro
+++ b/tests/auto/corelib.pro
@@ -11,7 +11,6 @@ SUBDIRS=\
    qcache \
    qchar \
    qcontiguouscache \
-   qcoreapplication \
    qcryptographichash \
    qdate \
    qdatetime \
@@ -24,11 +23,8 @@ SUBDIRS=\
    qline \
    qmap \
    qmargins \
-   qmath \
-   qmetatype \
    qmutex \
    qmutexlocker \
-   qobject \
    qobjectrace \
    qplugin \
    qpluginloader \
@@ -63,14 +59,12 @@ SUBDIRS=\
    qthreadstorage \
    qtime \
    qtimeline \
-   qtimer \
    qtmd5 \
    qtokenautomaton \
    quuid \
    qvarlengtharray \
    qvector \
    qwaitcondition \
-   qwineventnotifier \
    qwritelocker \
    selftests \
    utf8
diff --git a/tests/auto/corelib/corelib.pro b/tests/auto/corelib/corelib.pro
index 2533d714a0..5764ccc3e1 100644
--- a/tests/auto/corelib/corelib.pro
+++ b/tests/auto/corelib/corelib.pro
@@ -4,4 +4,5 @@ SUBDIRS=\
    codecs \
    concurrent \
    global \
-   io
+   io \
+   kernel
diff --git a/tests/auto/corelib/io/qfile/largefile/largefile.pro b/tests/auto/corelib/io/qfile/largefile/largefile.pro
index 6407cb6b3e..7786bdb892 100644
--- a/tests/auto/corelib/io/qfile/largefile/largefile.pro
+++ b/tests/auto/corelib/io/qfile/largefile/largefile.pro
@@ -6,3 +6,4 @@ SOURCES += tst_largefile.cpp
 wince*: SOURCES += $$QT_SOURCE_TREE/src/corelib/kernel/qfunctions_wince.cpp
 
 CONFIG += parallel_test
+CONFIG += insignificant_test # QTBUG-21175
diff --git a/tests/auto/corelib/kernel/kernel.pro b/tests/auto/corelib/kernel/kernel.pro
new file mode 100644
index 0000000000..9fb8868391
--- /dev/null
+++ b/tests/auto/corelib/kernel/kernel.pro
@@ -0,0 +1,22 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+    qabstractitemmodel \
+    qcoreapplication \
+    qeventloop \
+    qitemmodel \
+    qmath \
+    qmetaobject \
+    qmetatype \
+    qmimedata \
+    qobject \
+    qpointer \
+    qsignalmapper \
+    qsocketnotifier \
+    qtimer \
+    # qtipc \ # needs to be moved to qtscript
+    qtranslator \
+    qvariant \
+    qwineventnotifier
+
+!contains(QT_CONFIG, private_tests): SUBDIRS -= \
+    qsocketnotifier
diff --git a/tests/auto/qabstractitemmodel/.gitignore b/tests/auto/corelib/kernel/qabstractitemmodel/.gitignore
index f6f93f4b89..f6f93f4b89 100644
--- a/tests/auto/qabstractitemmodel/.gitignore
+++ b/tests/auto/corelib/kernel/qabstractitemmodel/.gitignore
diff --git a/tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro b/tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro
new file mode 100644
index 0000000000..50730b371f
--- /dev/null
+++ b/tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro
@@ -0,0 +1,9 @@
+load(qttest_p4)
+
+INCLUDEPATH += $$PWD/../../../modeltest
+QT += widgets
+SOURCES         += tst_qabstractitemmodel.cpp ../../../modeltest/dynamictreemodel.cpp ../../../modeltest/modeltest.cpp
+HEADERS         += ../../../modeltest/dynamictreemodel.h ../../../modeltest/modeltest.h
+
+
+
diff --git a/tests/auto/qabstractitemmodel/tst_qabstractitemmodel.cpp b/tests/auto/corelib/kernel/qabstractitemmodel/tst_qabstractitemmodel.cpp
index 6a7a16eae8..6a7a16eae8 100644
--- a/tests/auto/qabstractitemmodel/tst_qabstractitemmodel.cpp
+++ b/tests/auto/corelib/kernel/qabstractitemmodel/tst_qabstractitemmodel.cpp
diff --git a/tests/auto/qcoreapplication/.gitignore b/tests/auto/corelib/kernel/qcoreapplication/.gitignore
index 8cba8c359f..8cba8c359f 100644
--- a/tests/auto/qcoreapplication/.gitignore
+++ b/tests/auto/corelib/kernel/qcoreapplication/.gitignore
diff --git a/tests/auto/qcoreapplication/qcoreapplication.pro b/tests/auto/corelib/kernel/qcoreapplication/qcoreapplication.pro
index 031af39df7..031af39df7 100644
--- a/tests/auto/qcoreapplication/qcoreapplication.pro
+++ b/tests/auto/corelib/kernel/qcoreapplication/qcoreapplication.pro
diff --git a/tests/auto/qcoreapplication/tst_qcoreapplication.cpp b/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp
index 99f0941ac2..99f0941ac2 100644
--- a/tests/auto/qcoreapplication/tst_qcoreapplication.cpp
+++ b/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp
diff --git a/tests/auto/qeventloop/.gitignore b/tests/auto/corelib/kernel/qeventloop/.gitignore
index be3297188a..be3297188a 100644
--- a/tests/auto/qeventloop/.gitignore
+++ b/tests/auto/corelib/kernel/qeventloop/.gitignore
diff --git a/tests/auto/qeventloop/qeventloop.pro b/tests/auto/corelib/kernel/qeventloop/qeventloop.pro
index e3c170a33b..e3c170a33b 100644
--- a/tests/auto/qeventloop/qeventloop.pro
+++ b/tests/auto/corelib/kernel/qeventloop/qeventloop.pro
diff --git a/tests/auto/qeventloop/tst_qeventloop.cpp b/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp
index a702908549..6f8a75ed3d 100644
--- a/tests/auto/qeventloop/tst_qeventloop.cpp
+++ b/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp
@@ -59,7 +59,7 @@
 #include <unistd.h>
 #endif
 
-#include "../../shared/util.h"
+#include "../../../../shared/util.h"
 
 //TESTED_CLASS=
 //TESTED_FILES=
diff --git a/tests/auto/qitemmodel/.gitignore b/tests/auto/corelib/kernel/qitemmodel/.gitignore
index 017be17fa8..017be17fa8 100644
--- a/tests/auto/qitemmodel/.gitignore
+++ b/tests/auto/corelib/kernel/qitemmodel/.gitignore
diff --git a/tests/auto/qitemmodel/README b/tests/auto/corelib/kernel/qitemmodel/README
index bddec0cef2..bddec0cef2 100644
--- a/tests/auto/qitemmodel/README
+++ b/tests/auto/corelib/kernel/qitemmodel/README
diff --git a/tests/auto/qitemmodel/modelstotest.cpp b/tests/auto/corelib/kernel/qitemmodel/modelstotest.cpp
index 82c28b5303..82c28b5303 100644
--- a/tests/auto/qitemmodel/modelstotest.cpp
+++ b/tests/auto/corelib/kernel/qitemmodel/modelstotest.cpp
diff --git a/tests/auto/qitemmodel/qitemmodel.pro b/tests/auto/corelib/kernel/qitemmodel/qitemmodel.pro
index 97d55fcd4d..97d55fcd4d 100644
--- a/tests/auto/qitemmodel/qitemmodel.pro
+++ b/tests/auto/corelib/kernel/qitemmodel/qitemmodel.pro
diff --git a/tests/auto/qitemmodel/tst_qitemmodel.cpp b/tests/auto/corelib/kernel/qitemmodel/tst_qitemmodel.cpp
index 191e9e88a9..191e9e88a9 100644
--- a/tests/auto/qitemmodel/tst_qitemmodel.cpp
+++ b/tests/auto/corelib/kernel/qitemmodel/tst_qitemmodel.cpp
diff --git a/tests/auto/qmath/qmath.pro b/tests/auto/corelib/kernel/qmath/qmath.pro
index e5784ce7aa..e5784ce7aa 100644
--- a/tests/auto/qmath/qmath.pro
+++ b/tests/auto/corelib/kernel/qmath/qmath.pro
diff --git a/tests/auto/qmath/tst_qmath.cpp b/tests/auto/corelib/kernel/qmath/tst_qmath.cpp
index f908bd6e3e..f908bd6e3e 100644
--- a/tests/auto/qmath/tst_qmath.cpp
+++ b/tests/auto/corelib/kernel/qmath/tst_qmath.cpp
diff --git a/tests/auto/qmetaobject/.gitignore b/tests/auto/corelib/kernel/qmetaobject/.gitignore
index c5b38e7816..c5b38e7816 100644
--- a/tests/auto/qmetaobject/.gitignore
+++ b/tests/auto/corelib/kernel/qmetaobject/.gitignore
diff --git a/tests/auto/qmetaobject/qmetaobject.pro b/tests/auto/corelib/kernel/qmetaobject/qmetaobject.pro
index 7a4cf94e47..7a4cf94e47 100644
--- a/tests/auto/qmetaobject/qmetaobject.pro
+++ b/tests/auto/corelib/kernel/qmetaobject/qmetaobject.pro
diff --git a/tests/auto/qmetaobject/tst_qmetaobject.cpp b/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp
index a813a917d7..a813a917d7 100644
--- a/tests/auto/qmetaobject/tst_qmetaobject.cpp
+++ b/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp
diff --git a/tests/auto/corelib/kernel/qmetaproperty/qmetaproperty.pro b/tests/auto/corelib/kernel/qmetaproperty/qmetaproperty.pro
new file mode 100644
index 0000000000..4369f33b4c
--- /dev/null
+++ b/tests/auto/corelib/kernel/qmetaproperty/qmetaproperty.pro
@@ -0,0 +1,4 @@
+load(qttest_p4)
+QT = core gui
+SOURCES  += tst_qmetaproperty.cpp
+
diff --git a/tests/auto/corelib/kernel/qmetaproperty/tst_qmetaproperty.cpp b/tests/auto/corelib/kernel/qmetaproperty/tst_qmetaproperty.cpp
new file mode 100644
index 0000000000..7a457b05fa
--- /dev/null
+++ b/tests/auto/corelib/kernel/qmetaproperty/tst_qmetaproperty.cpp
@@ -0,0 +1,115 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#include <QtTest/QtTest>
+
+#include <qobject.h>
+#include <qmetaobject.h>
+
+class tst_QMetaProperty : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(EnumType value WRITE setValue READ getValue)
+    Q_PROPERTY(EnumType value2 WRITE set_value READ get_value)
+    Q_PROPERTY(int value8 READ value8)
+    Q_PROPERTY(int value9 READ value9 CONSTANT)
+    Q_PROPERTY(int value10 READ value10 FINAL)
+
+private slots:
+    void hasStdCppSet();
+    void isConstant();
+    void isFinal();
+
+public:
+    enum EnumType { EnumType1 };
+
+    void setValue(EnumType) {}
+    EnumType getValue() const { return EnumType1; }
+    void set_value(EnumType) {}
+    EnumType get_value() const { return EnumType1; }
+
+    int value8() const { return 1; }
+    int value9() const { return 1; }
+    int value10() const { return 1; }
+};
+
+void tst_QMetaProperty::hasStdCppSet()
+{
+    const QMetaObject *mo = metaObject();
+
+    QMetaProperty prop = mo->property(mo->indexOfProperty("value"));
+    QVERIFY(prop.isValid());
+    QVERIFY(prop.hasStdCppSet());
+
+    prop = mo->property(mo->indexOfProperty("value2"));
+    QVERIFY(prop.isValid());
+    QVERIFY(!prop.hasStdCppSet());
+}
+
+void tst_QMetaProperty::isConstant()
+{
+    const QMetaObject *mo = metaObject();
+
+    QMetaProperty prop = mo->property(mo->indexOfProperty("value8"));
+    QVERIFY(prop.isValid());
+    QVERIFY(!prop.isConstant());
+
+    prop = mo->property(mo->indexOfProperty("value9"));
+    QVERIFY(prop.isValid());
+    QVERIFY(prop.isConstant());
+}
+
+void tst_QMetaProperty::isFinal()
+{
+    const QMetaObject *mo = metaObject();
+
+    QMetaProperty prop = mo->property(mo->indexOfProperty("value10"));
+    QVERIFY(prop.isValid());
+    QVERIFY(prop.isFinal());
+
+    prop = mo->property(mo->indexOfProperty("value9"));
+    QVERIFY(prop.isValid());
+    QVERIFY(!prop.isFinal());
+}
+
+QTEST_MAIN(tst_QMetaProperty)
+#include "tst_qmetaproperty.moc"
diff --git a/tests/auto/qmetatype/.gitignore b/tests/auto/corelib/kernel/qmetatype/.gitignore
index 2d54331613..2d54331613 100644
--- a/tests/auto/qmetatype/.gitignore
+++ b/tests/auto/corelib/kernel/qmetatype/.gitignore
diff --git a/tests/auto/qmetatype/qmetatype.pro b/tests/auto/corelib/kernel/qmetatype/qmetatype.pro
index ed1de83927..ed1de83927 100644
--- a/tests/auto/qmetatype/qmetatype.pro
+++ b/tests/auto/corelib/kernel/qmetatype/qmetatype.pro
diff --git a/tests/auto/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
index 3fb60acf57..3fb60acf57 100644
--- a/tests/auto/qmetatype/tst_qmetatype.cpp
+++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
diff --git a/tests/auto/qmimedata/qmimedata.pro b/tests/auto/corelib/kernel/qmimedata/qmimedata.pro
index 13fbe65edc..13fbe65edc 100644
--- a/tests/auto/qmimedata/qmimedata.pro
+++ b/tests/auto/corelib/kernel/qmimedata/qmimedata.pro
diff --git a/tests/auto/qmimedata/tst_qmimedata.cpp b/tests/auto/corelib/kernel/qmimedata/tst_qmimedata.cpp
index 6876862603..6876862603 100644
--- a/tests/auto/qmimedata/tst_qmimedata.cpp
+++ b/tests/auto/corelib/kernel/qmimedata/tst_qmimedata.cpp
diff --git a/tests/auto/qobject/.gitignore b/tests/auto/corelib/kernel/qobject/.gitignore
index ea4d6d7f06..ea4d6d7f06 100644
--- a/tests/auto/qobject/.gitignore
+++ b/tests/auto/corelib/kernel/qobject/.gitignore
diff --git a/tests/auto/qobject/moc_oldnormalizeobject.cpp b/tests/auto/corelib/kernel/qobject/moc_oldnormalizeobject.cpp
index b275ff30fa..b275ff30fa 100644
--- a/tests/auto/qobject/moc_oldnormalizeobject.cpp
+++ b/tests/auto/corelib/kernel/qobject/moc_oldnormalizeobject.cpp
diff --git a/tests/auto/qobject/oldnormalizeobject.h b/tests/auto/corelib/kernel/qobject/oldnormalizeobject.h
index 4dfb7d97d2..4dfb7d97d2 100644
--- a/tests/auto/qobject/oldnormalizeobject.h
+++ b/tests/auto/corelib/kernel/qobject/oldnormalizeobject.h
diff --git a/tests/auto/qobject/qobject.pro b/tests/auto/corelib/kernel/qobject/qobject.pro
index 113e14a61d..113e14a61d 100644
--- a/tests/auto/qobject/qobject.pro
+++ b/tests/auto/corelib/kernel/qobject/qobject.pro
diff --git a/tests/auto/qobject/signalbug.cpp b/tests/auto/corelib/kernel/qobject/signalbug.cpp
index f81de47e2d..f81de47e2d 100644
--- a/tests/auto/qobject/signalbug.cpp
+++ b/tests/auto/corelib/kernel/qobject/signalbug.cpp
diff --git a/tests/auto/qobject/signalbug.h b/tests/auto/corelib/kernel/qobject/signalbug.h
index 1d332239b3..1d332239b3 100644
--- a/tests/auto/qobject/signalbug.h
+++ b/tests/auto/corelib/kernel/qobject/signalbug.h
diff --git a/tests/auto/qobject/signalbug.pro b/tests/auto/corelib/kernel/qobject/signalbug.pro
index a835264a93..a835264a93 100644
--- a/tests/auto/qobject/signalbug.pro
+++ b/tests/auto/corelib/kernel/qobject/signalbug.pro
diff --git a/tests/auto/qobject/tst_qobject.cpp b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
index faab1f5532..faab1f5532 100644
--- a/tests/auto/qobject/tst_qobject.cpp
+++ b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
diff --git a/tests/auto/qobject/tst_qobject.pro b/tests/auto/corelib/kernel/qobject/tst_qobject.pro
index 29de071328..29de071328 100644
--- a/tests/auto/qobject/tst_qobject.pro
+++ b/tests/auto/corelib/kernel/qobject/tst_qobject.pro
diff --git a/tests/auto/qpointer/.gitignore b/tests/auto/corelib/kernel/qpointer/.gitignore
index ce97ab782d..ce97ab782d 100644
--- a/tests/auto/qpointer/.gitignore
+++ b/tests/auto/corelib/kernel/qpointer/.gitignore
diff --git a/tests/auto/qpointer/qpointer.pro b/tests/auto/corelib/kernel/qpointer/qpointer.pro
index 5728b7bb4f..5728b7bb4f 100644
--- a/tests/auto/qpointer/qpointer.pro
+++ b/tests/auto/corelib/kernel/qpointer/qpointer.pro
diff --git a/tests/auto/qpointer/tst_qpointer.cpp b/tests/auto/corelib/kernel/qpointer/tst_qpointer.cpp
index fed98ec86a..fed98ec86a 100644
--- a/tests/auto/qpointer/tst_qpointer.cpp
+++ b/tests/auto/corelib/kernel/qpointer/tst_qpointer.cpp
diff --git a/tests/auto/qsignalmapper/.gitignore b/tests/auto/corelib/kernel/qsignalmapper/.gitignore
index 33fab268da..33fab268da 100644
--- a/tests/auto/qsignalmapper/.gitignore
+++ b/tests/auto/corelib/kernel/qsignalmapper/.gitignore
diff --git a/tests/auto/qsignalmapper/qsignalmapper.pro b/tests/auto/corelib/kernel/qsignalmapper/qsignalmapper.pro
index 5af4b70c63..5af4b70c63 100644
--- a/tests/auto/qsignalmapper/qsignalmapper.pro
+++ b/tests/auto/corelib/kernel/qsignalmapper/qsignalmapper.pro
diff --git a/tests/auto/qsignalmapper/tst_qsignalmapper.cpp b/tests/auto/corelib/kernel/qsignalmapper/tst_qsignalmapper.cpp
index a4dc123778..a4dc123778 100644
--- a/tests/auto/qsignalmapper/tst_qsignalmapper.cpp
+++ b/tests/auto/corelib/kernel/qsignalmapper/tst_qsignalmapper.cpp
diff --git a/tests/auto/qsocketnotifier/.gitignore b/tests/auto/corelib/kernel/qsocketnotifier/.gitignore
index 2e1568660c..2e1568660c 100644
--- a/tests/auto/qsocketnotifier/.gitignore
+++ b/tests/auto/corelib/kernel/qsocketnotifier/.gitignore
diff --git a/tests/auto/qsocketnotifier/qsocketnotifier.pro b/tests/auto/corelib/kernel/qsocketnotifier/qsocketnotifier.pro
index c0fdc6a9b3..0768c69caa 100644
--- a/tests/auto/qsocketnotifier/qsocketnotifier.pro
+++ b/tests/auto/corelib/kernel/qsocketnotifier/qsocketnotifier.pro
@@ -8,4 +8,4 @@ include(../platformsocketengine/platformsocketengine.pri)
 
 symbian: TARGET.CAPABILITY = NetworkServices
 
-
+CONFIG += insignificant_test # QTBUG-21204
diff --git a/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp b/tests/auto/corelib/kernel/qsocketnotifier/tst_qsocketnotifier.cpp
index 2c3a6c52bf..2c3a6c52bf 100644
--- a/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp
+++ b/tests/auto/corelib/kernel/qsocketnotifier/tst_qsocketnotifier.cpp
diff --git a/tests/auto/qtimer/.gitignore b/tests/auto/corelib/kernel/qtimer/.gitignore
index 14fd00629e..14fd00629e 100644
--- a/tests/auto/qtimer/.gitignore
+++ b/tests/auto/corelib/kernel/qtimer/.gitignore
diff --git a/tests/auto/qtimer/qtimer.pro b/tests/auto/corelib/kernel/qtimer/qtimer.pro
index 086df1dd18..086df1dd18 100644
--- a/tests/auto/qtimer/qtimer.pro
+++ b/tests/auto/corelib/kernel/qtimer/qtimer.pro
diff --git a/tests/auto/qtimer/tst_qtimer.cpp b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
index e08c903e7c..a8ac799d73 100644
--- a/tests/auto/qtimer/tst_qtimer.cpp
+++ b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
@@ -50,7 +50,7 @@
 #include <unistd.h>
 #endif
 
-#include "../../shared/util.h"
+#include "../../../../shared/util.h"
 
 
 //TESTED_CLASS=
diff --git a/tests/auto/qtipc/lackey/lackey.pro b/tests/auto/corelib/kernel/qtipc/lackey/lackey.pro
index 91659d701e..91659d701e 100644
--- a/tests/auto/qtipc/lackey/lackey.pro
+++ b/tests/auto/corelib/kernel/qtipc/lackey/lackey.pro
diff --git a/tests/auto/qtipc/lackey/main.cpp b/tests/auto/corelib/kernel/qtipc/lackey/main.cpp
index 3caae48740..3caae48740 100644
--- a/tests/auto/qtipc/lackey/main.cpp
+++ b/tests/auto/corelib/kernel/qtipc/lackey/main.cpp
diff --git a/tests/auto/qtipc/lackey/scripts/consumer.js b/tests/auto/corelib/kernel/qtipc/lackey/scripts/consumer.js
index 4d12dcac1a..4d12dcac1a 100644
--- a/tests/auto/qtipc/lackey/scripts/consumer.js
+++ b/tests/auto/corelib/kernel/qtipc/lackey/scripts/consumer.js
diff --git a/tests/auto/qtipc/lackey/scripts/producer.js b/tests/auto/corelib/kernel/qtipc/lackey/scripts/producer.js
index e02cd8b7bb..e02cd8b7bb 100644
--- a/tests/auto/qtipc/lackey/scripts/producer.js
+++ b/tests/auto/corelib/kernel/qtipc/lackey/scripts/producer.js
diff --git a/tests/auto/qtipc/lackey/scripts/readonly_segfault.js b/tests/auto/corelib/kernel/qtipc/lackey/scripts/readonly_segfault.js
index 3eaf789d23..3eaf789d23 100644
--- a/tests/auto/qtipc/lackey/scripts/readonly_segfault.js
+++ b/tests/auto/corelib/kernel/qtipc/lackey/scripts/readonly_segfault.js
diff --git a/tests/auto/qtipc/lackey/scripts/systemlock_read.js b/tests/auto/corelib/kernel/qtipc/lackey/scripts/systemlock_read.js
index 1048bc7955..1048bc7955 100644
--- a/tests/auto/qtipc/lackey/scripts/systemlock_read.js
+++ b/tests/auto/corelib/kernel/qtipc/lackey/scripts/systemlock_read.js
diff --git a/tests/auto/qtipc/lackey/scripts/systemlock_readwrite.js b/tests/auto/corelib/kernel/qtipc/lackey/scripts/systemlock_readwrite.js
index fc6367ff4b..fc6367ff4b 100644
--- a/tests/auto/qtipc/lackey/scripts/systemlock_readwrite.js
+++ b/tests/auto/corelib/kernel/qtipc/lackey/scripts/systemlock_readwrite.js
diff --git a/tests/auto/qtipc/lackey/scripts/systemsemaphore_acquire.js b/tests/auto/corelib/kernel/qtipc/lackey/scripts/systemsemaphore_acquire.js
index 5cff429b86..5cff429b86 100644
--- a/tests/auto/qtipc/lackey/scripts/systemsemaphore_acquire.js
+++ b/tests/auto/corelib/kernel/qtipc/lackey/scripts/systemsemaphore_acquire.js
diff --git a/tests/auto/qtipc/lackey/scripts/systemsemaphore_acquirerelease.js b/tests/auto/corelib/kernel/qtipc/lackey/scripts/systemsemaphore_acquirerelease.js
index cedde3f0ae..cedde3f0ae 100644
--- a/tests/auto/qtipc/lackey/scripts/systemsemaphore_acquirerelease.js
+++ b/tests/auto/corelib/kernel/qtipc/lackey/scripts/systemsemaphore_acquirerelease.js
diff --git a/tests/auto/qtipc/lackey/scripts/systemsemaphore_release.js b/tests/auto/corelib/kernel/qtipc/lackey/scripts/systemsemaphore_release.js
index c805e0fed8..c805e0fed8 100644
--- a/tests/auto/qtipc/lackey/scripts/systemsemaphore_release.js
+++ b/tests/auto/corelib/kernel/qtipc/lackey/scripts/systemsemaphore_release.js
diff --git a/tests/auto/qtipc/qsharedmemory/.gitignore b/tests/auto/corelib/kernel/qtipc/qsharedmemory/.gitignore
index 03ddcf29cf..03ddcf29cf 100644
--- a/tests/auto/qtipc/qsharedmemory/.gitignore
+++ b/tests/auto/corelib/kernel/qtipc/qsharedmemory/.gitignore
diff --git a/tests/auto/qtipc/qsharedmemory/qsharedmemory.pro b/tests/auto/corelib/kernel/qtipc/qsharedmemory/qsharedmemory.pro
index 9fef8e4112..9fef8e4112 100644
--- a/tests/auto/qtipc/qsharedmemory/qsharedmemory.pro
+++ b/tests/auto/corelib/kernel/qtipc/qsharedmemory/qsharedmemory.pro
diff --git a/tests/auto/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro b/tests/auto/corelib/kernel/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro
index e3d99bb85c..e3d99bb85c 100644
--- a/tests/auto/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro
+++ b/tests/auto/corelib/kernel/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro
diff --git a/tests/auto/qtipc/qsharedmemory/qsystemlock/tst_qsystemlock.cpp b/tests/auto/corelib/kernel/qtipc/qsharedmemory/qsystemlock/tst_qsystemlock.cpp
index 072b94f985..072b94f985 100644
--- a/tests/auto/qtipc/qsharedmemory/qsystemlock/tst_qsystemlock.cpp
+++ b/tests/auto/corelib/kernel/qtipc/qsharedmemory/qsystemlock/tst_qsystemlock.cpp
diff --git a/tests/auto/qtipc/qsharedmemory/src/qsystemlock.cpp b/tests/auto/corelib/kernel/qtipc/qsharedmemory/src/qsystemlock.cpp
index b48bd7bebe..b48bd7bebe 100644
--- a/tests/auto/qtipc/qsharedmemory/src/qsystemlock.cpp
+++ b/tests/auto/corelib/kernel/qtipc/qsharedmemory/src/qsystemlock.cpp
diff --git a/tests/auto/qtipc/qsharedmemory/src/qsystemlock.h b/tests/auto/corelib/kernel/qtipc/qsharedmemory/src/qsystemlock.h
index f9db4f879c..f9db4f879c 100644
--- a/tests/auto/qtipc/qsharedmemory/src/qsystemlock.h
+++ b/tests/auto/corelib/kernel/qtipc/qsharedmemory/src/qsystemlock.h
diff --git a/tests/auto/qtipc/qsharedmemory/src/qsystemlock_p.h b/tests/auto/corelib/kernel/qtipc/qsharedmemory/src/qsystemlock_p.h
index 628b005afc..628b005afc 100644
--- a/tests/auto/qtipc/qsharedmemory/src/qsystemlock_p.h
+++ b/tests/auto/corelib/kernel/qtipc/qsharedmemory/src/qsystemlock_p.h
diff --git a/tests/auto/qtipc/qsharedmemory/src/qsystemlock_unix.cpp b/tests/auto/corelib/kernel/qtipc/qsharedmemory/src/qsystemlock_unix.cpp
index 984379619e..984379619e 100644
--- a/tests/auto/qtipc/qsharedmemory/src/qsystemlock_unix.cpp
+++ b/tests/auto/corelib/kernel/qtipc/qsharedmemory/src/qsystemlock_unix.cpp
diff --git a/tests/auto/qtipc/qsharedmemory/src/qsystemlock_win.cpp b/tests/auto/corelib/kernel/qtipc/qsharedmemory/src/qsystemlock_win.cpp
index c04b596210..c04b596210 100644
--- a/tests/auto/qtipc/qsharedmemory/src/qsystemlock_win.cpp
+++ b/tests/auto/corelib/kernel/qtipc/qsharedmemory/src/qsystemlock_win.cpp
diff --git a/tests/auto/qtipc/qsharedmemory/src/src.pri b/tests/auto/corelib/kernel/qtipc/qsharedmemory/src/src.pri
index 8aaf528447..8aaf528447 100644
--- a/tests/auto/qtipc/qsharedmemory/src/src.pri
+++ b/tests/auto/corelib/kernel/qtipc/qsharedmemory/src/src.pri
diff --git a/tests/auto/qtipc/qsharedmemory/test/test.pro b/tests/auto/corelib/kernel/qtipc/qsharedmemory/test/test.pro
index 50c266986c..50c266986c 100644
--- a/tests/auto/qtipc/qsharedmemory/test/test.pro
+++ b/tests/auto/corelib/kernel/qtipc/qsharedmemory/test/test.pro
diff --git a/tests/auto/qtipc/qsharedmemory/tst_qsharedmemory.cpp b/tests/auto/corelib/kernel/qtipc/qsharedmemory/tst_qsharedmemory.cpp
index 38c6f0e8ee..38c6f0e8ee 100644
--- a/tests/auto/qtipc/qsharedmemory/tst_qsharedmemory.cpp
+++ b/tests/auto/corelib/kernel/qtipc/qsharedmemory/tst_qsharedmemory.cpp
diff --git a/tests/auto/qtipc/qsystemsemaphore/.gitignore b/tests/auto/corelib/kernel/qtipc/qsystemsemaphore/.gitignore
index 2b60bfb3e6..2b60bfb3e6 100644
--- a/tests/auto/qtipc/qsystemsemaphore/.gitignore
+++ b/tests/auto/corelib/kernel/qtipc/qsystemsemaphore/.gitignore
diff --git a/tests/auto/qtipc/qsystemsemaphore/files.qrc b/tests/auto/corelib/kernel/qtipc/qsystemsemaphore/files.qrc
index 62966903e8..62966903e8 100644
--- a/tests/auto/qtipc/qsystemsemaphore/files.qrc
+++ b/tests/auto/corelib/kernel/qtipc/qsystemsemaphore/files.qrc
diff --git a/tests/auto/qtipc/qsystemsemaphore/qsystemsemaphore.pro b/tests/auto/corelib/kernel/qtipc/qsystemsemaphore/qsystemsemaphore.pro
index e05b6b878b..e05b6b878b 100644
--- a/tests/auto/qtipc/qsystemsemaphore/qsystemsemaphore.pro
+++ b/tests/auto/corelib/kernel/qtipc/qsystemsemaphore/qsystemsemaphore.pro
diff --git a/tests/auto/qtipc/qsystemsemaphore/tst_qsystemsemaphore.cpp b/tests/auto/corelib/kernel/qtipc/qsystemsemaphore/tst_qsystemsemaphore.cpp
index df625b8661..df625b8661 100644
--- a/tests/auto/qtipc/qsystemsemaphore/tst_qsystemsemaphore.cpp
+++ b/tests/auto/corelib/kernel/qtipc/qsystemsemaphore/tst_qsystemsemaphore.cpp
diff --git a/tests/auto/qtipc/qtipc.pro b/tests/auto/corelib/kernel/qtipc/qtipc.pro
index ac647e097b..ac647e097b 100644
--- a/tests/auto/qtipc/qtipc.pro
+++ b/tests/auto/corelib/kernel/qtipc/qtipc.pro
diff --git a/tests/auto/qtranslator/.gitignore b/tests/auto/corelib/kernel/qtranslator/.gitignore
index ce24e1016b..ce24e1016b 100644
--- a/tests/auto/qtranslator/.gitignore
+++ b/tests/auto/corelib/kernel/qtranslator/.gitignore
diff --git a/tests/auto/qtranslator/hellotr_la.qm b/tests/auto/corelib/kernel/qtranslator/hellotr_la.qm
index cc42afe05c..cc42afe05c 100644
--- a/tests/auto/qtranslator/hellotr_la.qm
+++ b/tests/auto/corelib/kernel/qtranslator/hellotr_la.qm
diff --git a/tests/auto/qtranslator/hellotr_la.ts b/tests/auto/corelib/kernel/qtranslator/hellotr_la.ts
index 2a4a41b9ea..2a4a41b9ea 100644
--- a/tests/auto/qtranslator/hellotr_la.ts
+++ b/tests/auto/corelib/kernel/qtranslator/hellotr_la.ts
diff --git a/tests/auto/qtranslator/msgfmt_from_po.qm b/tests/auto/corelib/kernel/qtranslator/msgfmt_from_po.qm
index 7b62819459..7b62819459 100644
--- a/tests/auto/qtranslator/msgfmt_from_po.qm
+++ b/tests/auto/corelib/kernel/qtranslator/msgfmt_from_po.qm
diff --git a/tests/auto/qtranslator/qtranslator.pro b/tests/auto/corelib/kernel/qtranslator/qtranslator.pro
index c87af7b733..171216afb4 100644
--- a/tests/auto/qtranslator/qtranslator.pro
+++ b/tests/auto/corelib/kernel/qtranslator/qtranslator.pro
@@ -9,4 +9,4 @@ wince*|symbian: {
    DEPLOYMENT += addFiles
 }
 
-
+CONFIG += insignificant_test # QTBUG-21125
diff --git a/tests/auto/qtranslator/qtranslator.qrc b/tests/auto/corelib/kernel/qtranslator/qtranslator.qrc
index 333dcfaa21..333dcfaa21 100644
--- a/tests/auto/qtranslator/qtranslator.qrc
+++ b/tests/auto/corelib/kernel/qtranslator/qtranslator.qrc
diff --git a/tests/auto/qtranslator/tst_qtranslator.cpp b/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp
index 8e2ed157a4..8e2ed157a4 100644
--- a/tests/auto/qtranslator/tst_qtranslator.cpp
+++ b/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp
diff --git a/tests/auto/qvariant/.gitignore b/tests/auto/corelib/kernel/qvariant/.gitignore
index 2434ec945d..2434ec945d 100644
--- a/tests/auto/qvariant/.gitignore
+++ b/tests/auto/corelib/kernel/qvariant/.gitignore
diff --git a/tests/auto/qvariant/qvariant.pro b/tests/auto/corelib/kernel/qvariant/qvariant.pro
index 52af24ea85..52af24ea85 100644
--- a/tests/auto/qvariant/qvariant.pro
+++ b/tests/auto/corelib/kernel/qvariant/qvariant.pro
diff --git a/tests/auto/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
index 25a32cc734..25a32cc734 100644
--- a/tests/auto/qvariant/tst_qvariant.cpp
+++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
diff --git a/tests/auto/qwineventnotifier/.gitignore b/tests/auto/corelib/kernel/qwineventnotifier/.gitignore
index e2b5581e02..e2b5581e02 100644
--- a/tests/auto/qwineventnotifier/.gitignore
+++ b/tests/auto/corelib/kernel/qwineventnotifier/.gitignore
diff --git a/tests/auto/qwineventnotifier/qwineventnotifier.pro b/tests/auto/corelib/kernel/qwineventnotifier/qwineventnotifier.pro
index 4a5ea78ed1..4a5ea78ed1 100644
--- a/tests/auto/qwineventnotifier/qwineventnotifier.pro
+++ b/tests/auto/corelib/kernel/qwineventnotifier/qwineventnotifier.pro
diff --git a/tests/auto/qwineventnotifier/tst_qwineventnotifier.cpp b/tests/auto/corelib/kernel/qwineventnotifier/tst_qwineventnotifier.cpp
index cbe62f6662..cbe62f6662 100644
--- a/tests/auto/qwineventnotifier/tst_qwineventnotifier.cpp
+++ b/tests/auto/corelib/kernel/qwineventnotifier/tst_qwineventnotifier.cpp
diff --git a/tests/auto/gui.pro b/tests/auto/gui.pro
index 7525c6d5ce..bb23fa234a 100644
--- a/tests/auto/gui.pro
+++ b/tests/auto/gui.pro
@@ -10,7 +10,6 @@ SUBDIRS=\
     languagechange \
     modeltest \
     qabstractbutton \
-    qabstractitemmodel \
     qabstractitemview \
     qabstractprintdialog \
     qabstractproxymodel \
@@ -90,12 +89,9 @@ SUBDIRS=\
     qmainwindow \
     qmdisubwindow \
     qmessagebox \
-    qmetaobject \
-    qmimedata \
     qnetworkaccessmanager_and_qprogressdialog \
     qopengl \
     qplaintextedit \
-    qpointer \
     qprogressbar \
     qprogressdialog \
     qpushbutton \
@@ -106,7 +102,6 @@ SUBDIRS=\
     qscroller \
     qsharedpointer_and_qwidget \
     qsidebar \
-    qsignalmapper \
     qsizegrip \
     qslider \
     qsortfilterproxymodel \
@@ -127,12 +122,10 @@ SUBDIRS=\
     qtableview \
     qtablewidget \
     qtcpsocket \
-    qtipc \
     qtoolbar \
     qtoolbox \
     qtooltip \
     qtransformedscreen \
-    qtranslator \
     qtreeview \
     qtreewidget \
     qtreewidgetitemiterator \
diff --git a/tests/auto/network.pro b/tests/auto/network.pro
index 7f9ef3c04e..719923bd7f 100644
--- a/tests/auto/network.pro
+++ b/tests/auto/network.pro
@@ -8,7 +8,6 @@ SUBDIRS=\
     qabstractnetworkcache \
     qabstractsocket \
     qauthenticator \
-    qeventloop \
     qftp \
     qhostaddress \
     qhostinfo \
@@ -31,7 +30,6 @@ SUBDIRS=\
     qnetworkrequest \
     qnetworksession \
     qobjectperformance \
-    qsocketnotifier \
     qsocks5socketengine \
     qsslcertificate \
     qsslcipher \
@@ -51,6 +49,5 @@ SUBDIRS=\
     qhttpnetworkconnection \
     qhttpnetworkreply \
     qhttpsocketengine \
-    qsocketnotifier \
     qsocks5socketengine \
 
diff --git a/tests/auto/other.pro b/tests/auto/other.pro
index 48c5dcccdb..1b8f3c7e39 100644
--- a/tests/auto/other.pro
+++ b/tests/auto/other.pro
@@ -8,7 +8,6 @@ SUBDIRS=\
            qalgorithms \
            qcombobox \
            qfocusevent \
-           qitemmodel \
            qlayout \
            qmdiarea \
            qmenu \
@@ -18,7 +17,6 @@ SUBDIRS=\
            qtextbrowser \
            qtextedit \
            qtoolbutton \
-           qvariant \
            qwidget \
            qworkspace \
            windowsmobile
diff --git a/tests/auto/qabstractitemmodel/qabstractitemmodel.pro b/tests/auto/qabstractitemmodel/qabstractitemmodel.pro
deleted file mode 100644
index 543065a4c0..0000000000
--- a/tests/auto/qabstractitemmodel/qabstractitemmodel.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-load(qttest_p4)
-
-INCLUDEPATH += $$PWD/../modeltest
-QT += widgets
-SOURCES         += tst_qabstractitemmodel.cpp ../modeltest/dynamictreemodel.cpp ../modeltest/modeltest.cpp
-HEADERS         += ../modeltest/dynamictreemodel.h ../modeltest/modeltest.h
-
-
-