diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2012-06-26 17:30:57 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-29 22:42:19 +0200 |
| commit | dba22bc03690eaa00a7757dd024d8953ec74b30c (patch) | |
| tree | 3c5cfc060642467bed2b457f35996f86cbb48bc9 /tests/auto | |
| parent | f4f0c8b99b362822f85dd1859518e89d33e4bd3b (diff) | |
Move QStandardItem/QStandardItemModel to QtGui
The dependencies on QFont, QBrush, QIcon are all in QtGui, so there's
little sense to still have these classes in QtWidgets.
This also copies and pastes a version of QWidgetItemData as
QStandardItemData inside qstandarditemmodel_p.h.
Change-Id: Ibafc5a30748e7ce0b54753309ae6dc4a797fc20e
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Diffstat (limited to 'tests/auto')
12 files changed, 9 insertions, 6 deletions
diff --git a/tests/auto/corelib/itemmodels/qidentityproxymodel/qidentityproxymodel.pro b/tests/auto/corelib/itemmodels/qidentityproxymodel/qidentityproxymodel.pro index c56498a650..6de1ffaca2 100644 --- a/tests/auto/corelib/itemmodels/qidentityproxymodel/qidentityproxymodel.pro +++ b/tests/auto/corelib/itemmodels/qidentityproxymodel/qidentityproxymodel.pro @@ -4,6 +4,6 @@ TARGET = tst_qidentityproxymodel mtdir = ../../../other/modeltest INCLUDEPATH += $$PWD/$${mtdir} -QT += widgets testlib +QT += testlib SOURCES += tst_qidentityproxymodel.cpp $${mtdir}/dynamictreemodel.cpp $${mtdir}/modeltest.cpp HEADERS += $${mtdir}/dynamictreemodel.h $${mtdir}/modeltest.h diff --git a/tests/auto/corelib/itemmodels/qidentityproxymodel/tst_qidentityproxymodel.cpp b/tests/auto/corelib/itemmodels/qidentityproxymodel/tst_qidentityproxymodel.cpp index 567bb58752..01024649aa 100644 --- a/tests/auto/corelib/itemmodels/qidentityproxymodel/tst_qidentityproxymodel.cpp +++ b/tests/auto/corelib/itemmodels/qidentityproxymodel/tst_qidentityproxymodel.cpp @@ -41,7 +41,7 @@ #include <QtTest/QtTest> #include <QtCore/QCoreApplication> -#include <QtWidgets/QStandardItemModel> +#include <QtGui/QStandardItemModel> #include "dynamictreemodel.h" #include "qidentityproxymodel.h" diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp index b31b64d974..bb3132b94f 100644 --- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp +++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp @@ -44,7 +44,7 @@ #include "modeltest.h" #include <QtCore/QCoreApplication> -#include <QtWidgets/QStandardItem> +#include <QtGui/QStandardItem> #include <QtWidgets/QTreeView> #include <QtWidgets/QTableView> diff --git a/tests/auto/gui/gui.pro b/tests/auto/gui/gui.pro index 48fa2772f9..87aea70acb 100644 --- a/tests/auto/gui/gui.pro +++ b/tests/auto/gui/gui.pro @@ -7,3 +7,4 @@ SUBDIRS=\ qopengl \ text \ util \ + itemmodels \ diff --git a/tests/auto/gui/itemmodels/itemmodels.pro b/tests/auto/gui/itemmodels/itemmodels.pro new file mode 100644 index 0000000000..2e7fabfa7e --- /dev/null +++ b/tests/auto/gui/itemmodels/itemmodels.pro @@ -0,0 +1,4 @@ +TEMPLATE=subdirs +SUBDIRS= \ + qstandarditem \ + qstandarditemmodel \ diff --git a/tests/auto/widgets/itemviews/qstandarditem/.gitignore b/tests/auto/gui/itemmodels/qstandarditem/.gitignore index 6da85cc6c8..6da85cc6c8 100644 --- a/tests/auto/widgets/itemviews/qstandarditem/.gitignore +++ b/tests/auto/gui/itemmodels/qstandarditem/.gitignore diff --git a/tests/auto/widgets/itemviews/qstandarditem/qstandarditem.pro b/tests/auto/gui/itemmodels/qstandarditem/qstandarditem.pro index 1fef72e4b3..282737ed7d 100644 --- a/tests/auto/widgets/itemviews/qstandarditem/qstandarditem.pro +++ b/tests/auto/gui/itemmodels/qstandarditem/qstandarditem.pro @@ -1,7 +1,7 @@ CONFIG += testcase CONFIG += parallel_test TARGET = tst_qstandarditem -QT += widgets testlib +QT += gui testlib SOURCES += tst_qstandarditem.cpp diff --git a/tests/auto/widgets/itemviews/qstandarditem/tst_qstandarditem.cpp b/tests/auto/gui/itemmodels/qstandarditem/tst_qstandarditem.cpp index 8ababf0ac4..8ababf0ac4 100644 --- a/tests/auto/widgets/itemviews/qstandarditem/tst_qstandarditem.cpp +++ b/tests/auto/gui/itemmodels/qstandarditem/tst_qstandarditem.cpp diff --git a/tests/auto/widgets/itemviews/qstandarditemmodel/.gitignore b/tests/auto/gui/itemmodels/qstandarditemmodel/.gitignore index c218efce58..c218efce58 100644 --- a/tests/auto/widgets/itemviews/qstandarditemmodel/.gitignore +++ b/tests/auto/gui/itemmodels/qstandarditemmodel/.gitignore diff --git a/tests/auto/widgets/itemviews/qstandarditemmodel/qstandarditemmodel.pro b/tests/auto/gui/itemmodels/qstandarditemmodel/qstandarditemmodel.pro index 71ef4acb88..71ef4acb88 100644 --- a/tests/auto/widgets/itemviews/qstandarditemmodel/qstandarditemmodel.pro +++ b/tests/auto/gui/itemmodels/qstandarditemmodel/qstandarditemmodel.pro diff --git a/tests/auto/widgets/itemviews/qstandarditemmodel/tst_qstandarditemmodel.cpp b/tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp index 1c661f9060..1c661f9060 100644 --- a/tests/auto/widgets/itemviews/qstandarditemmodel/tst_qstandarditemmodel.cpp +++ b/tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp diff --git a/tests/auto/widgets/itemviews/itemviews.pro b/tests/auto/widgets/itemviews/itemviews.pro index e13a5a82ca..2bd8ec43d3 100644 --- a/tests/auto/widgets/itemviews/itemviews.pro +++ b/tests/auto/widgets/itemviews/itemviews.pro @@ -11,8 +11,6 @@ SUBDIRS=\ qitemview \ qlistview \ qlistwidget \ - qstandarditem \ - qstandarditemmodel \ qtableview \ qtablewidget \ qtreeview \ |