From 3a7e6157d1a9865a31a5641605bbe9b0fc25e1d4 Mon Sep 17 00:00:00 2001 From: Holger Ihrig Date: Thu, 25 Aug 2011 12:16:22 +0200 Subject: [PATCH] Moving relevant tests to corelib/kernel Added Test for qmetaproperty Marked QSocketNotifier Autotest as insignificant. See QTBUG-21204 Marked qtranslator Autotest as insignificant. See QTBUG-21125 Marked corelib/io/qfile/largefile as insignificant. See QTBUG-21175 Task-number: QTBUG-21066 Change-Id: I2a7f6587845c355091bb07c8dd3d1557d16db0be Reviewed-on: http://codereview.qt.nokia.com/3598 Reviewed-by: Qt Sanity Bot Reviewed-by: Sergio Ahumada --- tests/auto/corelib.pro | 6 - tests/auto/corelib/corelib.pro | 3 +- .../corelib/io/qfile/largefile/largefile.pro | 1 + tests/auto/corelib/kernel/kernel.pro | 22 ++++ .../kernel}/qabstractitemmodel/.gitignore | 0 .../qabstractitemmodel/qabstractitemmodel.pro | 9 ++ .../tst_qabstractitemmodel.cpp | 0 .../kernel}/qcoreapplication/.gitignore | 0 .../qcoreapplication/qcoreapplication.pro | 0 .../qcoreapplication/tst_qcoreapplication.cpp | 0 .../kernel}/qeventloop/.gitignore | 0 .../kernel}/qeventloop/qeventloop.pro | 0 .../kernel}/qeventloop/tst_qeventloop.cpp | 2 +- .../kernel}/qitemmodel/.gitignore | 0 .../{ => corelib/kernel}/qitemmodel/README | 0 .../kernel}/qitemmodel/modelstotest.cpp | 0 .../kernel}/qitemmodel/qitemmodel.pro | 0 .../kernel}/qitemmodel/tst_qitemmodel.cpp | 0 .../auto/{ => corelib/kernel}/qmath/qmath.pro | 0 .../{ => corelib/kernel}/qmath/tst_qmath.cpp | 0 .../kernel}/qmetaobject/.gitignore | 0 .../kernel}/qmetaobject/qmetaobject.pro | 0 .../kernel}/qmetaobject/tst_qmetaobject.cpp | 0 .../kernel/qmetaproperty/qmetaproperty.pro | 4 + .../qmetaproperty/tst_qmetaproperty.cpp | 115 ++++++++++++++++++ .../{ => corelib/kernel}/qmetatype/.gitignore | 0 .../kernel}/qmetatype/qmetatype.pro | 0 .../kernel}/qmetatype/tst_qmetatype.cpp | 0 .../kernel}/qmimedata/qmimedata.pro | 0 .../kernel}/qmimedata/tst_qmimedata.cpp | 0 .../{ => corelib/kernel}/qobject/.gitignore | 0 .../qobject/moc_oldnormalizeobject.cpp | 0 .../kernel}/qobject/oldnormalizeobject.h | 0 .../{ => corelib/kernel}/qobject/qobject.pro | 0 .../kernel}/qobject/signalbug.cpp | 0 .../{ => corelib/kernel}/qobject/signalbug.h | 0 .../kernel}/qobject/signalbug.pro | 0 .../kernel}/qobject/tst_qobject.cpp | 0 .../kernel}/qobject/tst_qobject.pro | 0 .../{ => corelib/kernel}/qpointer/.gitignore | 0 .../kernel}/qpointer/qpointer.pro | 0 .../kernel}/qpointer/tst_qpointer.cpp | 0 .../kernel}/qsignalmapper/.gitignore | 0 .../kernel}/qsignalmapper/qsignalmapper.pro | 0 .../qsignalmapper/tst_qsignalmapper.cpp | 0 .../kernel}/qsocketnotifier/.gitignore | 0 .../qsocketnotifier/qsocketnotifier.pro | 2 +- .../qsocketnotifier/tst_qsocketnotifier.cpp | 0 .../{ => corelib/kernel}/qtimer/.gitignore | 0 .../{ => corelib/kernel}/qtimer/qtimer.pro | 0 .../kernel}/qtimer/tst_qtimer.cpp | 2 +- .../kernel}/qtipc/lackey/lackey.pro | 0 .../kernel}/qtipc/lackey/main.cpp | 0 .../kernel}/qtipc/lackey/scripts/consumer.js | 0 .../kernel}/qtipc/lackey/scripts/producer.js | 0 .../qtipc/lackey/scripts/readonly_segfault.js | 0 .../qtipc/lackey/scripts/systemlock_read.js | 0 .../lackey/scripts/systemlock_readwrite.js | 0 .../lackey/scripts/systemsemaphore_acquire.js | 0 .../scripts/systemsemaphore_acquirerelease.js | 0 .../lackey/scripts/systemsemaphore_release.js | 0 .../kernel}/qtipc/qsharedmemory/.gitignore | 0 .../qtipc/qsharedmemory/qsharedmemory.pro | 0 .../qsharedmemory/qsystemlock/qsystemlock.pro | 0 .../qsystemlock/tst_qsystemlock.cpp | 0 .../qtipc/qsharedmemory/src/qsystemlock.cpp | 0 .../qtipc/qsharedmemory/src/qsystemlock.h | 0 .../qtipc/qsharedmemory/src/qsystemlock_p.h | 0 .../qsharedmemory/src/qsystemlock_unix.cpp | 0 .../qsharedmemory/src/qsystemlock_win.cpp | 0 .../kernel}/qtipc/qsharedmemory/src/src.pri | 0 .../kernel}/qtipc/qsharedmemory/test/test.pro | 0 .../qtipc/qsharedmemory/tst_qsharedmemory.cpp | 0 .../kernel}/qtipc/qsystemsemaphore/.gitignore | 0 .../kernel}/qtipc/qsystemsemaphore/files.qrc | 0 .../qsystemsemaphore/qsystemsemaphore.pro | 0 .../qsystemsemaphore/tst_qsystemsemaphore.cpp | 0 .../auto/{ => corelib/kernel}/qtipc/qtipc.pro | 0 .../kernel}/qtranslator/.gitignore | 0 .../kernel}/qtranslator/hellotr_la.qm | Bin .../kernel}/qtranslator/hellotr_la.ts | 0 .../kernel}/qtranslator/msgfmt_from_po.qm | Bin .../kernel}/qtranslator/qtranslator.pro | 2 +- .../kernel}/qtranslator/qtranslator.qrc | 0 .../kernel}/qtranslator/tst_qtranslator.cpp | 0 .../{ => corelib/kernel}/qvariant/.gitignore | 0 .../kernel}/qvariant/qvariant.pro | 0 .../kernel}/qvariant/tst_qvariant.cpp | 0 .../kernel}/qwineventnotifier/.gitignore | 0 .../qwineventnotifier/qwineventnotifier.pro | 0 .../tst_qwineventnotifier.cpp | 0 tests/auto/gui.pro | 7 -- tests/auto/network.pro | 3 - tests/auto/other.pro | 2 - .../qabstractitemmodel/qabstractitemmodel.pro | 9 -- 95 files changed, 157 insertions(+), 32 deletions(-) create mode 100644 tests/auto/corelib/kernel/kernel.pro rename tests/auto/{ => corelib/kernel}/qabstractitemmodel/.gitignore (100%) create mode 100644 tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro rename tests/auto/{ => corelib/kernel}/qabstractitemmodel/tst_qabstractitemmodel.cpp (100%) rename tests/auto/{ => corelib/kernel}/qcoreapplication/.gitignore (100%) rename tests/auto/{ => corelib/kernel}/qcoreapplication/qcoreapplication.pro (100%) rename tests/auto/{ => corelib/kernel}/qcoreapplication/tst_qcoreapplication.cpp (100%) rename tests/auto/{ => corelib/kernel}/qeventloop/.gitignore (100%) rename tests/auto/{ => corelib/kernel}/qeventloop/qeventloop.pro (100%) rename tests/auto/{ => corelib/kernel}/qeventloop/tst_qeventloop.cpp (99%) rename tests/auto/{ => corelib/kernel}/qitemmodel/.gitignore (100%) rename tests/auto/{ => corelib/kernel}/qitemmodel/README (100%) rename tests/auto/{ => corelib/kernel}/qitemmodel/modelstotest.cpp (100%) rename tests/auto/{ => corelib/kernel}/qitemmodel/qitemmodel.pro (100%) rename tests/auto/{ => corelib/kernel}/qitemmodel/tst_qitemmodel.cpp (100%) rename tests/auto/{ => corelib/kernel}/qmath/qmath.pro (100%) rename tests/auto/{ => corelib/kernel}/qmath/tst_qmath.cpp (100%) rename tests/auto/{ => corelib/kernel}/qmetaobject/.gitignore (100%) rename tests/auto/{ => corelib/kernel}/qmetaobject/qmetaobject.pro (100%) rename tests/auto/{ => corelib/kernel}/qmetaobject/tst_qmetaobject.cpp (100%) create mode 100644 tests/auto/corelib/kernel/qmetaproperty/qmetaproperty.pro create mode 100644 tests/auto/corelib/kernel/qmetaproperty/tst_qmetaproperty.cpp rename tests/auto/{ => corelib/kernel}/qmetatype/.gitignore (100%) rename tests/auto/{ => corelib/kernel}/qmetatype/qmetatype.pro (100%) rename tests/auto/{ => corelib/kernel}/qmetatype/tst_qmetatype.cpp (100%) rename tests/auto/{ => corelib/kernel}/qmimedata/qmimedata.pro (100%) rename tests/auto/{ => corelib/kernel}/qmimedata/tst_qmimedata.cpp (100%) rename tests/auto/{ => corelib/kernel}/qobject/.gitignore (100%) rename tests/auto/{ => corelib/kernel}/qobject/moc_oldnormalizeobject.cpp (100%) rename tests/auto/{ => corelib/kernel}/qobject/oldnormalizeobject.h (100%) rename tests/auto/{ => corelib/kernel}/qobject/qobject.pro (100%) rename tests/auto/{ => corelib/kernel}/qobject/signalbug.cpp (100%) rename tests/auto/{ => corelib/kernel}/qobject/signalbug.h (100%) rename tests/auto/{ => corelib/kernel}/qobject/signalbug.pro (100%) rename tests/auto/{ => corelib/kernel}/qobject/tst_qobject.cpp (100%) rename tests/auto/{ => corelib/kernel}/qobject/tst_qobject.pro (100%) rename tests/auto/{ => corelib/kernel}/qpointer/.gitignore (100%) rename tests/auto/{ => corelib/kernel}/qpointer/qpointer.pro (100%) rename tests/auto/{ => corelib/kernel}/qpointer/tst_qpointer.cpp (100%) rename tests/auto/{ => corelib/kernel}/qsignalmapper/.gitignore (100%) rename tests/auto/{ => corelib/kernel}/qsignalmapper/qsignalmapper.pro (100%) rename tests/auto/{ => corelib/kernel}/qsignalmapper/tst_qsignalmapper.cpp (100%) rename tests/auto/{ => corelib/kernel}/qsocketnotifier/.gitignore (100%) rename tests/auto/{ => corelib/kernel}/qsocketnotifier/qsocketnotifier.pro (84%) rename tests/auto/{ => corelib/kernel}/qsocketnotifier/tst_qsocketnotifier.cpp (100%) rename tests/auto/{ => corelib/kernel}/qtimer/.gitignore (100%) rename tests/auto/{ => corelib/kernel}/qtimer/qtimer.pro (100%) rename tests/auto/{ => corelib/kernel}/qtimer/tst_qtimer.cpp (99%) rename tests/auto/{ => corelib/kernel}/qtipc/lackey/lackey.pro (100%) rename tests/auto/{ => corelib/kernel}/qtipc/lackey/main.cpp (100%) rename tests/auto/{ => corelib/kernel}/qtipc/lackey/scripts/consumer.js (100%) rename tests/auto/{ => corelib/kernel}/qtipc/lackey/scripts/producer.js (100%) rename tests/auto/{ => corelib/kernel}/qtipc/lackey/scripts/readonly_segfault.js (100%) rename tests/auto/{ => corelib/kernel}/qtipc/lackey/scripts/systemlock_read.js (100%) rename tests/auto/{ => corelib/kernel}/qtipc/lackey/scripts/systemlock_readwrite.js (100%) rename tests/auto/{ => corelib/kernel}/qtipc/lackey/scripts/systemsemaphore_acquire.js (100%) rename tests/auto/{ => corelib/kernel}/qtipc/lackey/scripts/systemsemaphore_acquirerelease.js (100%) rename tests/auto/{ => corelib/kernel}/qtipc/lackey/scripts/systemsemaphore_release.js (100%) rename tests/auto/{ => corelib/kernel}/qtipc/qsharedmemory/.gitignore (100%) rename tests/auto/{ => corelib/kernel}/qtipc/qsharedmemory/qsharedmemory.pro (100%) rename tests/auto/{ => corelib/kernel}/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro (100%) rename tests/auto/{ => corelib/kernel}/qtipc/qsharedmemory/qsystemlock/tst_qsystemlock.cpp (100%) rename tests/auto/{ => corelib/kernel}/qtipc/qsharedmemory/src/qsystemlock.cpp (100%) rename tests/auto/{ => corelib/kernel}/qtipc/qsharedmemory/src/qsystemlock.h (100%) rename tests/auto/{ => corelib/kernel}/qtipc/qsharedmemory/src/qsystemlock_p.h (100%) rename tests/auto/{ => corelib/kernel}/qtipc/qsharedmemory/src/qsystemlock_unix.cpp (100%) rename tests/auto/{ => corelib/kernel}/qtipc/qsharedmemory/src/qsystemlock_win.cpp (100%) rename tests/auto/{ => corelib/kernel}/qtipc/qsharedmemory/src/src.pri (100%) rename tests/auto/{ => corelib/kernel}/qtipc/qsharedmemory/test/test.pro (100%) rename tests/auto/{ => corelib/kernel}/qtipc/qsharedmemory/tst_qsharedmemory.cpp (100%) rename tests/auto/{ => corelib/kernel}/qtipc/qsystemsemaphore/.gitignore (100%) rename tests/auto/{ => corelib/kernel}/qtipc/qsystemsemaphore/files.qrc (100%) rename tests/auto/{ => corelib/kernel}/qtipc/qsystemsemaphore/qsystemsemaphore.pro (100%) rename tests/auto/{ => corelib/kernel}/qtipc/qsystemsemaphore/tst_qsystemsemaphore.cpp (100%) rename tests/auto/{ => corelib/kernel}/qtipc/qtipc.pro (100%) rename tests/auto/{ => corelib/kernel}/qtranslator/.gitignore (100%) rename tests/auto/{ => corelib/kernel}/qtranslator/hellotr_la.qm (100%) rename tests/auto/{ => corelib/kernel}/qtranslator/hellotr_la.ts (100%) rename tests/auto/{ => corelib/kernel}/qtranslator/msgfmt_from_po.qm (100%) rename tests/auto/{ => corelib/kernel}/qtranslator/qtranslator.pro (83%) rename tests/auto/{ => corelib/kernel}/qtranslator/qtranslator.qrc (100%) rename tests/auto/{ => corelib/kernel}/qtranslator/tst_qtranslator.cpp (100%) rename tests/auto/{ => corelib/kernel}/qvariant/.gitignore (100%) rename tests/auto/{ => corelib/kernel}/qvariant/qvariant.pro (100%) rename tests/auto/{ => corelib/kernel}/qvariant/tst_qvariant.cpp (100%) rename tests/auto/{ => corelib/kernel}/qwineventnotifier/.gitignore (100%) rename tests/auto/{ => corelib/kernel}/qwineventnotifier/qwineventnotifier.pro (100%) rename tests/auto/{ => corelib/kernel}/qwineventnotifier/tst_qwineventnotifier.cpp (100%) delete mode 100644 tests/auto/qabstractitemmodel/qabstractitemmodel.pro diff --git a/tests/auto/corelib.pro b/tests/auto/corelib.pro index da2089b66ba..8da834d111c 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 2533d714a00..5764ccc3e1f 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 6407cb6b3ef..7786bdb8924 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 00000000000..9fb8868391b --- /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 similarity index 100% rename from tests/auto/qabstractitemmodel/.gitignore rename to 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 00000000000..50730b371f1 --- /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 similarity index 100% rename from tests/auto/qabstractitemmodel/tst_qabstractitemmodel.cpp rename to tests/auto/corelib/kernel/qabstractitemmodel/tst_qabstractitemmodel.cpp diff --git a/tests/auto/qcoreapplication/.gitignore b/tests/auto/corelib/kernel/qcoreapplication/.gitignore similarity index 100% rename from tests/auto/qcoreapplication/.gitignore rename to tests/auto/corelib/kernel/qcoreapplication/.gitignore diff --git a/tests/auto/qcoreapplication/qcoreapplication.pro b/tests/auto/corelib/kernel/qcoreapplication/qcoreapplication.pro similarity index 100% rename from tests/auto/qcoreapplication/qcoreapplication.pro rename to 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 similarity index 100% rename from tests/auto/qcoreapplication/tst_qcoreapplication.cpp rename to tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp diff --git a/tests/auto/qeventloop/.gitignore b/tests/auto/corelib/kernel/qeventloop/.gitignore similarity index 100% rename from tests/auto/qeventloop/.gitignore rename to tests/auto/corelib/kernel/qeventloop/.gitignore diff --git a/tests/auto/qeventloop/qeventloop.pro b/tests/auto/corelib/kernel/qeventloop/qeventloop.pro similarity index 100% rename from tests/auto/qeventloop/qeventloop.pro rename to 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 similarity index 99% rename from tests/auto/qeventloop/tst_qeventloop.cpp rename to tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp index a702908549b..6f8a75ed3df 100644 --- a/tests/auto/qeventloop/tst_qeventloop.cpp +++ b/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp @@ -59,7 +59,7 @@ #include #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 similarity index 100% rename from tests/auto/qitemmodel/.gitignore rename to tests/auto/corelib/kernel/qitemmodel/.gitignore diff --git a/tests/auto/qitemmodel/README b/tests/auto/corelib/kernel/qitemmodel/README similarity index 100% rename from tests/auto/qitemmodel/README rename to tests/auto/corelib/kernel/qitemmodel/README diff --git a/tests/auto/qitemmodel/modelstotest.cpp b/tests/auto/corelib/kernel/qitemmodel/modelstotest.cpp similarity index 100% rename from tests/auto/qitemmodel/modelstotest.cpp rename to tests/auto/corelib/kernel/qitemmodel/modelstotest.cpp diff --git a/tests/auto/qitemmodel/qitemmodel.pro b/tests/auto/corelib/kernel/qitemmodel/qitemmodel.pro similarity index 100% rename from tests/auto/qitemmodel/qitemmodel.pro rename to 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 similarity index 100% rename from tests/auto/qitemmodel/tst_qitemmodel.cpp rename to tests/auto/corelib/kernel/qitemmodel/tst_qitemmodel.cpp diff --git a/tests/auto/qmath/qmath.pro b/tests/auto/corelib/kernel/qmath/qmath.pro similarity index 100% rename from tests/auto/qmath/qmath.pro rename to 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 similarity index 100% rename from tests/auto/qmath/tst_qmath.cpp rename to tests/auto/corelib/kernel/qmath/tst_qmath.cpp diff --git a/tests/auto/qmetaobject/.gitignore b/tests/auto/corelib/kernel/qmetaobject/.gitignore similarity index 100% rename from tests/auto/qmetaobject/.gitignore rename to tests/auto/corelib/kernel/qmetaobject/.gitignore diff --git a/tests/auto/qmetaobject/qmetaobject.pro b/tests/auto/corelib/kernel/qmetaobject/qmetaobject.pro similarity index 100% rename from tests/auto/qmetaobject/qmetaobject.pro rename to 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 similarity index 100% rename from tests/auto/qmetaobject/tst_qmetaobject.cpp rename to 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 00000000000..4369f33b4cc --- /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 00000000000..7a457b05fa3 --- /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 + +#include +#include + +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 similarity index 100% rename from tests/auto/qmetatype/.gitignore rename to tests/auto/corelib/kernel/qmetatype/.gitignore diff --git a/tests/auto/qmetatype/qmetatype.pro b/tests/auto/corelib/kernel/qmetatype/qmetatype.pro similarity index 100% rename from tests/auto/qmetatype/qmetatype.pro rename to 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 similarity index 100% rename from tests/auto/qmetatype/tst_qmetatype.cpp rename to tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp diff --git a/tests/auto/qmimedata/qmimedata.pro b/tests/auto/corelib/kernel/qmimedata/qmimedata.pro similarity index 100% rename from tests/auto/qmimedata/qmimedata.pro rename to 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 similarity index 100% rename from tests/auto/qmimedata/tst_qmimedata.cpp rename to tests/auto/corelib/kernel/qmimedata/tst_qmimedata.cpp diff --git a/tests/auto/qobject/.gitignore b/tests/auto/corelib/kernel/qobject/.gitignore similarity index 100% rename from tests/auto/qobject/.gitignore rename to tests/auto/corelib/kernel/qobject/.gitignore diff --git a/tests/auto/qobject/moc_oldnormalizeobject.cpp b/tests/auto/corelib/kernel/qobject/moc_oldnormalizeobject.cpp similarity index 100% rename from tests/auto/qobject/moc_oldnormalizeobject.cpp rename to tests/auto/corelib/kernel/qobject/moc_oldnormalizeobject.cpp diff --git a/tests/auto/qobject/oldnormalizeobject.h b/tests/auto/corelib/kernel/qobject/oldnormalizeobject.h similarity index 100% rename from tests/auto/qobject/oldnormalizeobject.h rename to tests/auto/corelib/kernel/qobject/oldnormalizeobject.h diff --git a/tests/auto/qobject/qobject.pro b/tests/auto/corelib/kernel/qobject/qobject.pro similarity index 100% rename from tests/auto/qobject/qobject.pro rename to tests/auto/corelib/kernel/qobject/qobject.pro diff --git a/tests/auto/qobject/signalbug.cpp b/tests/auto/corelib/kernel/qobject/signalbug.cpp similarity index 100% rename from tests/auto/qobject/signalbug.cpp rename to tests/auto/corelib/kernel/qobject/signalbug.cpp diff --git a/tests/auto/qobject/signalbug.h b/tests/auto/corelib/kernel/qobject/signalbug.h similarity index 100% rename from tests/auto/qobject/signalbug.h rename to tests/auto/corelib/kernel/qobject/signalbug.h diff --git a/tests/auto/qobject/signalbug.pro b/tests/auto/corelib/kernel/qobject/signalbug.pro similarity index 100% rename from tests/auto/qobject/signalbug.pro rename to 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 similarity index 100% rename from tests/auto/qobject/tst_qobject.cpp rename to 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 similarity index 100% rename from tests/auto/qobject/tst_qobject.pro rename to tests/auto/corelib/kernel/qobject/tst_qobject.pro diff --git a/tests/auto/qpointer/.gitignore b/tests/auto/corelib/kernel/qpointer/.gitignore similarity index 100% rename from tests/auto/qpointer/.gitignore rename to tests/auto/corelib/kernel/qpointer/.gitignore diff --git a/tests/auto/qpointer/qpointer.pro b/tests/auto/corelib/kernel/qpointer/qpointer.pro similarity index 100% rename from tests/auto/qpointer/qpointer.pro rename to 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 similarity index 100% rename from tests/auto/qpointer/tst_qpointer.cpp rename to tests/auto/corelib/kernel/qpointer/tst_qpointer.cpp diff --git a/tests/auto/qsignalmapper/.gitignore b/tests/auto/corelib/kernel/qsignalmapper/.gitignore similarity index 100% rename from tests/auto/qsignalmapper/.gitignore rename to tests/auto/corelib/kernel/qsignalmapper/.gitignore diff --git a/tests/auto/qsignalmapper/qsignalmapper.pro b/tests/auto/corelib/kernel/qsignalmapper/qsignalmapper.pro similarity index 100% rename from tests/auto/qsignalmapper/qsignalmapper.pro rename to 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 similarity index 100% rename from tests/auto/qsignalmapper/tst_qsignalmapper.cpp rename to tests/auto/corelib/kernel/qsignalmapper/tst_qsignalmapper.cpp diff --git a/tests/auto/qsocketnotifier/.gitignore b/tests/auto/corelib/kernel/qsocketnotifier/.gitignore similarity index 100% rename from tests/auto/qsocketnotifier/.gitignore rename to tests/auto/corelib/kernel/qsocketnotifier/.gitignore diff --git a/tests/auto/qsocketnotifier/qsocketnotifier.pro b/tests/auto/corelib/kernel/qsocketnotifier/qsocketnotifier.pro similarity index 84% rename from tests/auto/qsocketnotifier/qsocketnotifier.pro rename to tests/auto/corelib/kernel/qsocketnotifier/qsocketnotifier.pro index c0fdc6a9b3d..0768c69caa4 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 similarity index 100% rename from tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp rename to tests/auto/corelib/kernel/qsocketnotifier/tst_qsocketnotifier.cpp diff --git a/tests/auto/qtimer/.gitignore b/tests/auto/corelib/kernel/qtimer/.gitignore similarity index 100% rename from tests/auto/qtimer/.gitignore rename to tests/auto/corelib/kernel/qtimer/.gitignore diff --git a/tests/auto/qtimer/qtimer.pro b/tests/auto/corelib/kernel/qtimer/qtimer.pro similarity index 100% rename from tests/auto/qtimer/qtimer.pro rename to 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 similarity index 99% rename from tests/auto/qtimer/tst_qtimer.cpp rename to tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp index e08c903e7c1..a8ac799d733 100644 --- a/tests/auto/qtimer/tst_qtimer.cpp +++ b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp @@ -50,7 +50,7 @@ #include #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 similarity index 100% rename from tests/auto/qtipc/lackey/lackey.pro rename to 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 similarity index 100% rename from tests/auto/qtipc/lackey/main.cpp rename to 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 similarity index 100% rename from tests/auto/qtipc/lackey/scripts/consumer.js rename to 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 similarity index 100% rename from tests/auto/qtipc/lackey/scripts/producer.js rename to 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 similarity index 100% rename from tests/auto/qtipc/lackey/scripts/readonly_segfault.js rename to 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 similarity index 100% rename from tests/auto/qtipc/lackey/scripts/systemlock_read.js rename to 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 similarity index 100% rename from tests/auto/qtipc/lackey/scripts/systemlock_readwrite.js rename to 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 similarity index 100% rename from tests/auto/qtipc/lackey/scripts/systemsemaphore_acquire.js rename to 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 similarity index 100% rename from tests/auto/qtipc/lackey/scripts/systemsemaphore_acquirerelease.js rename to 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 similarity index 100% rename from tests/auto/qtipc/lackey/scripts/systemsemaphore_release.js rename to 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 similarity index 100% rename from tests/auto/qtipc/qsharedmemory/.gitignore rename to 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 similarity index 100% rename from tests/auto/qtipc/qsharedmemory/qsharedmemory.pro rename to 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 similarity index 100% rename from tests/auto/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro rename to 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 similarity index 100% rename from tests/auto/qtipc/qsharedmemory/qsystemlock/tst_qsystemlock.cpp rename to 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 similarity index 100% rename from tests/auto/qtipc/qsharedmemory/src/qsystemlock.cpp rename to 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 similarity index 100% rename from tests/auto/qtipc/qsharedmemory/src/qsystemlock.h rename to 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 similarity index 100% rename from tests/auto/qtipc/qsharedmemory/src/qsystemlock_p.h rename to 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 similarity index 100% rename from tests/auto/qtipc/qsharedmemory/src/qsystemlock_unix.cpp rename to 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 similarity index 100% rename from tests/auto/qtipc/qsharedmemory/src/qsystemlock_win.cpp rename to 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 similarity index 100% rename from tests/auto/qtipc/qsharedmemory/src/src.pri rename to 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 similarity index 100% rename from tests/auto/qtipc/qsharedmemory/test/test.pro rename to 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 similarity index 100% rename from tests/auto/qtipc/qsharedmemory/tst_qsharedmemory.cpp rename to 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 similarity index 100% rename from tests/auto/qtipc/qsystemsemaphore/.gitignore rename to 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 similarity index 100% rename from tests/auto/qtipc/qsystemsemaphore/files.qrc rename to 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 similarity index 100% rename from tests/auto/qtipc/qsystemsemaphore/qsystemsemaphore.pro rename to 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 similarity index 100% rename from tests/auto/qtipc/qsystemsemaphore/tst_qsystemsemaphore.cpp rename to 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 similarity index 100% rename from tests/auto/qtipc/qtipc.pro rename to tests/auto/corelib/kernel/qtipc/qtipc.pro diff --git a/tests/auto/qtranslator/.gitignore b/tests/auto/corelib/kernel/qtranslator/.gitignore similarity index 100% rename from tests/auto/qtranslator/.gitignore rename to tests/auto/corelib/kernel/qtranslator/.gitignore diff --git a/tests/auto/qtranslator/hellotr_la.qm b/tests/auto/corelib/kernel/qtranslator/hellotr_la.qm similarity index 100% rename from tests/auto/qtranslator/hellotr_la.qm rename to 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 similarity index 100% rename from tests/auto/qtranslator/hellotr_la.ts rename to 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 similarity index 100% rename from tests/auto/qtranslator/msgfmt_from_po.qm rename to 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 similarity index 83% rename from tests/auto/qtranslator/qtranslator.pro rename to tests/auto/corelib/kernel/qtranslator/qtranslator.pro index c87af7b7333..171216afb4c 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 similarity index 100% rename from tests/auto/qtranslator/qtranslator.qrc rename to 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 similarity index 100% rename from tests/auto/qtranslator/tst_qtranslator.cpp rename to tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp diff --git a/tests/auto/qvariant/.gitignore b/tests/auto/corelib/kernel/qvariant/.gitignore similarity index 100% rename from tests/auto/qvariant/.gitignore rename to tests/auto/corelib/kernel/qvariant/.gitignore diff --git a/tests/auto/qvariant/qvariant.pro b/tests/auto/corelib/kernel/qvariant/qvariant.pro similarity index 100% rename from tests/auto/qvariant/qvariant.pro rename to 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 similarity index 100% rename from tests/auto/qvariant/tst_qvariant.cpp rename to tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp diff --git a/tests/auto/qwineventnotifier/.gitignore b/tests/auto/corelib/kernel/qwineventnotifier/.gitignore similarity index 100% rename from tests/auto/qwineventnotifier/.gitignore rename to tests/auto/corelib/kernel/qwineventnotifier/.gitignore diff --git a/tests/auto/qwineventnotifier/qwineventnotifier.pro b/tests/auto/corelib/kernel/qwineventnotifier/qwineventnotifier.pro similarity index 100% rename from tests/auto/qwineventnotifier/qwineventnotifier.pro rename to 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 similarity index 100% rename from tests/auto/qwineventnotifier/tst_qwineventnotifier.cpp rename to tests/auto/corelib/kernel/qwineventnotifier/tst_qwineventnotifier.cpp diff --git a/tests/auto/gui.pro b/tests/auto/gui.pro index 7525c6d5ce2..bb23fa234af 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 7f9ef3c04e2..719923bd7f2 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 48c5dcccdb0..1b8f3c7e39c 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 543065a4c05..00000000000 --- 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 - - -