Moved tests into integrationtests/ and widgets/

Task-number: QTBUG-19013

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

3 files changed, 0 insertions, 111 deletions

diff --git a/tests/auto/qitemeditorfactory/.gitignore b/tests/auto/qitemeditorfactory/.gitignore
deleted file mode 100644
index 33a458e65d..0000000000
--- a/tests/auto/qitemeditorfactory/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-tst_qitemeditorfactory
diff --git a/tests/auto/qitemeditorfactory/qitemeditorfactory.pro b/tests/auto/qitemeditorfactory/qitemeditorfactory.pro
deleted file mode 100644
index 89bc944c51..0000000000
--- a/tests/auto/qitemeditorfactory/qitemeditorfactory.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-load(qttest_p4)
-QT += widgets
-SOURCES  += tst_qitemeditorfactory.cpp
-
-
diff --git a/tests/auto/qitemeditorfactory/tst_qitemeditorfactory.cpp b/tests/auto/qitemeditorfactory/tst_qitemeditorfactory.cpp
deleted file mode 100644
index 53c00dab0e..0000000000
--- a/tests/auto/qitemeditorfactory/tst_qitemeditorfactory.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-/****************************************************************************
-**
-** 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 <QtGui/QtGui>
-#include <QtWidgets/QtWidgets>
-#include <QtTest/QtTest>
-
-class tst_QItemEditorFactory: public QObject
-{
-    Q_OBJECT
-private slots:
-    void createEditor();
-    void createCustomEditor();
-};
-
-void tst_QItemEditorFactory::createEditor()
-{
-    const QItemEditorFactory *factory = QItemEditorFactory::defaultFactory();
-
-    QWidget parent;
-
-    QWidget *w = factory->createEditor(QVariant::String, &parent);
-    QCOMPARE(w->metaObject()->className(), "QExpandingLineEdit");
-}
-
-//we make it inherit from QObject so that we can use QPointer
-class MyEditor : public QObject, public QStandardItemEditorCreator<QDoubleSpinBox>
-{
-};
-
-void tst_QItemEditorFactory::createCustomEditor()
-{
-    QPointer<MyEditor> creator = new MyEditor;
-    QPointer<MyEditor> creator2 = new MyEditor;
-
-    {
-        QItemEditorFactory editorFactory;
-
-        editorFactory.registerEditor(QVariant::Rect, creator);
-        editorFactory.registerEditor(QVariant::RectF, creator);
-
-        //creator should not be deleted as a result of calling the next line
-        editorFactory.registerEditor(QVariant::Rect, creator2);
-        QVERIFY(creator);
-
-        //this should erase creator2
-        editorFactory.registerEditor(QVariant::Rect, creator);
-        QVERIFY(creator2.isNull());
-
-
-        QWidget parent;
-
-        QWidget *w = editorFactory.createEditor(QVariant::Rect, &parent);
-        QCOMPARE(w->metaObject()->className(), "QDoubleSpinBox");
-        QCOMPARE(w->metaObject()->userProperty().type(), QVariant::Double);
-    }
-
-    //editorFactory has been deleted, so should be creator
-    //because editorFActory has the ownership
-    QVERIFY(creator.isNull());
-    QVERIFY(creator2.isNull());
-
-    delete creator;
-}
-
-QTEST_MAIN(tst_QItemEditorFactory)
-#include "tst_qitemeditorfactory.moc"
-