diff options
-rw-r--r-- | src/corelib/itemmodels/itemmodels.pri | 16 | ||||
-rw-r--r-- | src/corelib/itemmodels/qabstractproxymodel.cpp (renamed from src/widgets/itemviews/qabstractproxymodel.cpp) | 2 | ||||
-rw-r--r-- | src/corelib/itemmodels/qabstractproxymodel.h (renamed from src/widgets/itemviews/qabstractproxymodel.h) | 4 | ||||
-rw-r--r-- | src/corelib/itemmodels/qabstractproxymodel_p.h (renamed from src/widgets/itemviews/qabstractproxymodel_p.h) | 2 | ||||
-rw-r--r-- | src/corelib/itemmodels/qidentityproxymodel.cpp (renamed from src/widgets/itemviews/qidentityproxymodel.cpp) | 2 | ||||
-rw-r--r-- | src/corelib/itemmodels/qidentityproxymodel.h (renamed from src/widgets/itemviews/qidentityproxymodel.h) | 6 | ||||
-rw-r--r-- | src/corelib/itemmodels/qitemselectionmodel.cpp (renamed from src/widgets/itemviews/qitemselectionmodel.cpp) | 6 | ||||
-rw-r--r-- | src/corelib/itemmodels/qitemselectionmodel.h (renamed from src/widgets/itemviews/qitemselectionmodel.h) | 10 | ||||
-rw-r--r-- | src/corelib/itemmodels/qitemselectionmodel_p.h (renamed from src/widgets/itemviews/qitemselectionmodel_p.h) | 0 | ||||
-rw-r--r-- | src/corelib/itemmodels/qsortfilterproxymodel.cpp (renamed from src/widgets/itemviews/qsortfilterproxymodel.cpp) | 2 | ||||
-rw-r--r-- | src/corelib/itemmodels/qsortfilterproxymodel.h (renamed from src/widgets/itemviews/qsortfilterproxymodel.h) | 6 | ||||
-rw-r--r-- | src/corelib/itemmodels/qstringlistmodel.cpp (renamed from src/widgets/itemviews/qstringlistmodel.cpp) | 2 | ||||
-rw-r--r-- | src/corelib/itemmodels/qstringlistmodel.h (renamed from src/widgets/itemviews/qstringlistmodel.h) | 4 | ||||
-rw-r--r-- | src/widgets/itemviews/itemviews.pri | 12 | ||||
-rw-r--r-- | src/widgets/itemviews/qabstractitemview.h | 2 | ||||
-rw-r--r-- | src/widgets/itemviews/qlistwidget.h | 2 | ||||
-rw-r--r-- | src/widgets/util/qcompleter.cpp | 2 | ||||
-rw-r--r-- | src/widgets/util/qcompleter_p.h | 2 | ||||
-rw-r--r-- | tests/auto/corelib/itemmodels/itemmodels.pro | 7 | ||||
-rw-r--r-- | tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp | 4 | ||||
-rw-r--r-- | tests/auto/corelib/itemmodels/qabstractproxymodel/.gitignore (renamed from tests/auto/widgets/itemviews/qabstractproxymodel/.gitignore) | 0 | ||||
-rw-r--r-- | tests/auto/corelib/itemmodels/qabstractproxymodel/qabstractproxymodel.pro (renamed from tests/auto/widgets/itemviews/qabstractproxymodel/qabstractproxymodel.pro) | 0 | ||||
-rw-r--r-- | tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp (renamed from tests/auto/widgets/itemviews/qabstractproxymodel/tst_qabstractproxymodel.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/corelib/itemmodels/qidentityproxymodel/qidentityproxymodel.pro (renamed from tests/auto/widgets/itemviews/qidentityproxymodel/qidentityproxymodel.pro) | 0 | ||||
-rw-r--r-- | tests/auto/corelib/itemmodels/qidentityproxymodel/tst_qidentityproxymodel.cpp (renamed from tests/auto/widgets/itemviews/qidentityproxymodel/tst_qidentityproxymodel.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/corelib/itemmodels/qitemselectionmodel/.gitignore (renamed from tests/auto/widgets/itemviews/qitemselectionmodel/.gitignore) | 0 | ||||
-rw-r--r-- | tests/auto/corelib/itemmodels/qitemselectionmodel/qitemselectionmodel.pro (renamed from tests/auto/widgets/itemviews/qitemselectionmodel/qitemselectionmodel.pro) | 0 | ||||
-rw-r--r-- | tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp (renamed from tests/auto/widgets/itemviews/qitemselectionmodel/tst_qitemselectionmodel.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/corelib/itemmodels/qsortfilterproxymodel/.gitignore (renamed from tests/auto/widgets/itemviews/qsortfilterproxymodel/.gitignore) | 0 | ||||
-rw-r--r-- | tests/auto/corelib/itemmodels/qsortfilterproxymodel/qsortfilterproxymodel.pro (renamed from tests/auto/widgets/itemviews/qsortfilterproxymodel/qsortfilterproxymodel.pro) | 0 | ||||
-rw-r--r-- | tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp (renamed from tests/auto/widgets/itemviews/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/corelib/itemmodels/qstringlistmodel/.gitignore (renamed from tests/auto/widgets/itemviews/qstringlistmodel/.gitignore) | 0 | ||||
-rw-r--r-- | tests/auto/corelib/itemmodels/qstringlistmodel/qmodellistener.h (renamed from tests/auto/widgets/itemviews/qstringlistmodel/qmodellistener.h) | 0 | ||||
-rw-r--r-- | tests/auto/corelib/itemmodels/qstringlistmodel/qstringlistmodel.pro (renamed from tests/auto/widgets/itemviews/qstringlistmodel/qstringlistmodel.pro) | 0 | ||||
-rw-r--r-- | tests/auto/corelib/itemmodels/qstringlistmodel/tst_qstringlistmodel.cpp (renamed from tests/auto/widgets/itemviews/qstringlistmodel/tst_qstringlistmodel.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/widgets/itemviews/itemviews.pro | 5 |
36 files changed, 49 insertions, 49 deletions
diff --git a/src/corelib/itemmodels/itemmodels.pri b/src/corelib/itemmodels/itemmodels.pri index 618c748612..83ec4c5dbf 100644 --- a/src/corelib/itemmodels/itemmodels.pri +++ b/src/corelib/itemmodels/itemmodels.pri @@ -2,7 +2,19 @@ HEADERS += \ itemmodels/qabstractitemmodel.h \ - itemmodels/qabstractitemmodel_p.h + itemmodels/qabstractitemmodel_p.h \ + itemmodels/qabstractproxymodel.h \ + itemmodels/qabstractproxymodel_p.h \ + itemmodels/qitemselectionmodel.h \ + itemmodels/qitemselectionmodel_p.h \ + itemmodels/qidentityproxymodel.h \ + itemmodels/qsortfilterproxymodel.h \ + itemmodels/qstringlistmodel.h SOURCES += \ - itemmodels/qabstractitemmodel.cpp + itemmodels/qabstractitemmodel.cpp \ + itemmodels/qabstractproxymodel.cpp \ + itemmodels/qitemselectionmodel.cpp \ + itemmodels/qidentityproxymodel.cpp \ + itemmodels/qsortfilterproxymodel.cpp \ + itemmodels/qstringlistmodel.cpp diff --git a/src/widgets/itemviews/qabstractproxymodel.cpp b/src/corelib/itemmodels/qabstractproxymodel.cpp index 47810d6cc7..4beea7b5d9 100644 --- a/src/widgets/itemviews/qabstractproxymodel.cpp +++ b/src/corelib/itemmodels/qabstractproxymodel.cpp @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE \brief The QAbstractProxyModel class provides a base class for proxy item models that can do sorting, filtering or other data processing tasks. \ingroup model-view - \inmodule QtWidgets + \inmodule QtCore This class defines the standard interface that proxy models must use to be able to interoperate correctly with other model/view components. It is not diff --git a/src/widgets/itemviews/qabstractproxymodel.h b/src/corelib/itemmodels/qabstractproxymodel.h index a24755b556..655ea1db02 100644 --- a/src/widgets/itemviews/qabstractproxymodel.h +++ b/src/corelib/itemmodels/qabstractproxymodel.h @@ -48,14 +48,14 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) +QT_MODULE(Core) #ifndef QT_NO_PROXYMODEL class QAbstractProxyModelPrivate; class QItemSelection; -class Q_WIDGETS_EXPORT QAbstractProxyModel : public QAbstractItemModel +class Q_CORE_EXPORT QAbstractProxyModel : public QAbstractItemModel { Q_OBJECT diff --git a/src/widgets/itemviews/qabstractproxymodel_p.h b/src/corelib/itemmodels/qabstractproxymodel_p.h index 9bd38d1cdc..cb798e0439 100644 --- a/src/widgets/itemviews/qabstractproxymodel_p.h +++ b/src/corelib/itemmodels/qabstractproxymodel_p.h @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE -class QAbstractProxyModelPrivate : public QAbstractItemModelPrivate +class Q_CORE_EXPORT QAbstractProxyModelPrivate : public QAbstractItemModelPrivate { Q_DECLARE_PUBLIC(QAbstractProxyModel) public: diff --git a/src/widgets/itemviews/qidentityproxymodel.cpp b/src/corelib/itemmodels/qidentityproxymodel.cpp index c891565794..6edb5df0fb 100644 --- a/src/widgets/itemviews/qidentityproxymodel.cpp +++ b/src/corelib/itemmodels/qidentityproxymodel.cpp @@ -90,7 +90,7 @@ class QIdentityProxyModelPrivate : public QAbstractProxyModelPrivate \brief The QIdentityProxyModel class proxies its source model unmodified \ingroup model-view - \inmodule QtWidgets + \inmodule QtCore QIdentityProxyModel can be used to forward the structure of a source model exactly, with no sorting, filtering or other transformation. This is similar in concept to an identity matrix where A.I = A. diff --git a/src/widgets/itemviews/qidentityproxymodel.h b/src/corelib/itemmodels/qidentityproxymodel.h index 8a8422244f..9d3c085829 100644 --- a/src/widgets/itemviews/qidentityproxymodel.h +++ b/src/corelib/itemmodels/qidentityproxymodel.h @@ -43,7 +43,7 @@ #ifndef QIDENTITYPROXYMODEL_H #define QIDENTITYPROXYMODEL_H -#include <QtWidgets/qabstractproxymodel.h> +#include <QtCore/qabstractproxymodel.h> #ifndef QT_NO_IDENTITYPROXYMODEL @@ -51,11 +51,11 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) +QT_MODULE(Core) class QIdentityProxyModelPrivate; -class Q_WIDGETS_EXPORT QIdentityProxyModel : public QAbstractProxyModel +class Q_CORE_EXPORT QIdentityProxyModel : public QAbstractProxyModel { Q_OBJECT public: diff --git a/src/widgets/itemviews/qitemselectionmodel.cpp b/src/corelib/itemmodels/qitemselectionmodel.cpp index 08470a4300..d4a2efd35f 100644 --- a/src/widgets/itemviews/qitemselectionmodel.cpp +++ b/src/corelib/itemmodels/qitemselectionmodel.cpp @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE range of selected items in a model. \ingroup model-view - \inmodule QtWidgets + \inmodule QtCore A QItemSelectionRange contains information about a range of selected items in a model. A range of items is a contiguous array @@ -331,7 +331,7 @@ QModelIndexList QItemSelectionRange::indexes() const \brief The QItemSelection class manages information about selected items in a model. \ingroup model-view - \inmodule QtWidgets + \inmodule QtCore A QItemSelection describes the items in a model that have been selected by the user. A QItemSelection is basically a list of @@ -921,7 +921,7 @@ void QItemSelectionModelPrivate::_q_layoutChanged() \brief The QItemSelectionModel class keeps track of a view's selected items. \ingroup model-view - \inmodule QtWidgets + \inmodule QtCore A QItemSelectionModel keeps track of the selected items in a view, or in several views onto the same model. It also keeps track of the diff --git a/src/widgets/itemviews/qitemselectionmodel.h b/src/corelib/itemmodels/qitemselectionmodel.h index ea0528a590..be1f34f9a2 100644 --- a/src/widgets/itemviews/qitemselectionmodel.h +++ b/src/corelib/itemmodels/qitemselectionmodel.h @@ -51,11 +51,11 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) +QT_MODULE(Core) #ifndef QT_NO_ITEMVIEWS -class Q_WIDGETS_EXPORT QItemSelectionRange +class Q_CORE_EXPORT QItemSelectionRange { public: @@ -148,7 +148,7 @@ inline QItemSelectionRange::QItemSelectionRange(const QModelIndex &atopLeft, class QItemSelection; class QItemSelectionModelPrivate; -class Q_WIDGETS_EXPORT QItemSelectionModel : public QObject +class Q_CORE_EXPORT QItemSelectionModel : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QItemSelectionModel) @@ -229,7 +229,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QItemSelectionModel::SelectionFlags) // dummy implentation of qHash() necessary for instantiating QList<QItemSelectionRange>::toSet() with MSVC inline uint qHash(const QItemSelectionRange &) { return 0; } -class Q_WIDGETS_EXPORT QItemSelection : public QList<QItemSelectionRange> +class Q_CORE_EXPORT QItemSelection : public QList<QItemSelectionRange> { public: QItemSelection() {} @@ -244,7 +244,7 @@ public: }; #ifndef QT_NO_DEBUG_STREAM -Q_WIDGETS_EXPORT QDebug operator<<(QDebug, const QItemSelectionRange &); +Q_CORE_EXPORT QDebug operator<<(QDebug, const QItemSelectionRange &); #endif #endif // QT_NO_ITEMVIEWS diff --git a/src/widgets/itemviews/qitemselectionmodel_p.h b/src/corelib/itemmodels/qitemselectionmodel_p.h index 5eb9ecccda..5eb9ecccda 100644 --- a/src/widgets/itemviews/qitemselectionmodel_p.h +++ b/src/corelib/itemmodels/qitemselectionmodel_p.h diff --git a/src/widgets/itemviews/qsortfilterproxymodel.cpp b/src/corelib/itemmodels/qsortfilterproxymodel.cpp index f29ad7bc57..71f68f2409 100644 --- a/src/widgets/itemviews/qsortfilterproxymodel.cpp +++ b/src/corelib/itemmodels/qsortfilterproxymodel.cpp @@ -1496,7 +1496,7 @@ void QSortFilterProxyModelPrivate::_q_sourceColumnsMoved( filtering data passed between another model and a view. \ingroup model-view - \inmodule QtWidgets + \inmodule QtCore QSortFilterProxyModel can be used for sorting items, filtering out items, or both. The model transforms the structure of a source model by mapping diff --git a/src/widgets/itemviews/qsortfilterproxymodel.h b/src/corelib/itemmodels/qsortfilterproxymodel.h index bbeec1470c..80f49e405a 100644 --- a/src/widgets/itemviews/qsortfilterproxymodel.h +++ b/src/corelib/itemmodels/qsortfilterproxymodel.h @@ -42,7 +42,7 @@ #ifndef QSORTFILTERPROXYMODEL_H #define QSORTFILTERPROXYMODEL_H -#include <QtWidgets/qabstractproxymodel.h> +#include <QtCore/qabstractproxymodel.h> #ifndef QT_NO_SORTFILTERPROXYMODEL @@ -52,13 +52,13 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) +QT_MODULE(Core) class QSortFilterProxyModelPrivate; class QSortFilterProxyModelLessThan; class QSortFilterProxyModelGreaterThan; -class Q_WIDGETS_EXPORT QSortFilterProxyModel : public QAbstractProxyModel +class Q_CORE_EXPORT QSortFilterProxyModel : public QAbstractProxyModel { friend class QSortFilterProxyModelLessThan; friend class QSortFilterProxyModelGreaterThan; diff --git a/src/widgets/itemviews/qstringlistmodel.cpp b/src/corelib/itemmodels/qstringlistmodel.cpp index 95c0456765..434f790890 100644 --- a/src/widgets/itemviews/qstringlistmodel.cpp +++ b/src/corelib/itemmodels/qstringlistmodel.cpp @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE \brief The QStringListModel class provides a model that supplies strings to views. \ingroup model-view - \inmodule QtWidgets + \inmodule QtCore QStringListModel is an editable model that can be used for simple cases where you need to display a number of strings in a view diff --git a/src/widgets/itemviews/qstringlistmodel.h b/src/corelib/itemmodels/qstringlistmodel.h index c2b8042134..3d1331403f 100644 --- a/src/widgets/itemviews/qstringlistmodel.h +++ b/src/corelib/itemmodels/qstringlistmodel.h @@ -49,11 +49,11 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) +QT_MODULE(Core) #ifndef QT_NO_STRINGLISTMODEL -class Q_WIDGETS_EXPORT QStringListModel : public QAbstractListModel +class Q_CORE_EXPORT QStringListModel : public QAbstractListModel { Q_OBJECT public: diff --git a/src/widgets/itemviews/itemviews.pri b/src/widgets/itemviews/itemviews.pri index 7ef704546e..d5a5012f83 100644 --- a/src/widgets/itemviews/itemviews.pri +++ b/src/widgets/itemviews/itemviews.pri @@ -4,7 +4,6 @@ HEADERS += \ itemviews/qabstractitemview.h \ itemviews/qabstractitemview_p.h \ itemviews/qheaderview.h \ - itemviews/qidentityproxymodel.h \ itemviews/qlistview.h \ itemviews/qlistview_p.h \ itemviews/qbsptree_p.h \ @@ -14,8 +13,6 @@ HEADERS += \ itemviews/qtreeview_p.h \ itemviews/qabstractitemdelegate.h \ itemviews/qitemdelegate.h \ - itemviews/qitemselectionmodel.h \ - itemviews/qitemselectionmodel_p.h \ itemviews/qdirmodel.h \ itemviews/qlistwidget.h \ itemviews/qlistwidget_p.h \ @@ -26,14 +23,10 @@ HEADERS += \ itemviews/qwidgetitemdata_p.h \ itemviews/qproxymodel.h \ itemviews/qproxymodel_p.h \ - itemviews/qabstractproxymodel.h \ - itemviews/qabstractproxymodel_p.h \ - itemviews/qsortfilterproxymodel.h \ itemviews/qitemeditorfactory.h \ itemviews/qitemeditorfactory_p.h \ itemviews/qstandarditemmodel.h \ itemviews/qstandarditemmodel_p.h \ - itemviews/qstringlistmodel.h \ itemviews/qtreewidgetitemiterator.h \ itemviews/qdatawidgetmapper.h \ itemviews/qfileiconprovider.h \ @@ -45,24 +38,19 @@ HEADERS += \ SOURCES += \ itemviews/qabstractitemview.cpp \ itemviews/qheaderview.cpp \ - itemviews/qidentityproxymodel.cpp \ itemviews/qlistview.cpp \ itemviews/qbsptree.cpp \ itemviews/qtableview.cpp \ itemviews/qtreeview.cpp \ itemviews/qabstractitemdelegate.cpp \ itemviews/qitemdelegate.cpp \ - itemviews/qitemselectionmodel.cpp \ itemviews/qdirmodel.cpp \ itemviews/qlistwidget.cpp \ itemviews/qtablewidget.cpp \ itemviews/qtreewidget.cpp \ itemviews/qproxymodel.cpp \ - itemviews/qabstractproxymodel.cpp \ - itemviews/qsortfilterproxymodel.cpp \ itemviews/qitemeditorfactory.cpp \ itemviews/qstandarditemmodel.cpp \ - itemviews/qstringlistmodel.cpp \ itemviews/qtreewidgetitemiterator.cpp \ itemviews/qdatawidgetmapper.cpp \ itemviews/qfileiconprovider.cpp \ diff --git a/src/widgets/itemviews/qabstractitemview.h b/src/widgets/itemviews/qabstractitemview.h index 25501e67c5..00b19cf0d1 100644 --- a/src/widgets/itemviews/qabstractitemview.h +++ b/src/widgets/itemviews/qabstractitemview.h @@ -44,7 +44,7 @@ #include <QtWidgets/qabstractscrollarea.h> #include <QtCore/qabstractitemmodel.h> -#include <QtWidgets/qitemselectionmodel.h> +#include <QtCore/qitemselectionmodel.h> #include <QtWidgets/qabstractitemdelegate.h> QT_BEGIN_HEADER diff --git a/src/widgets/itemviews/qlistwidget.h b/src/widgets/itemviews/qlistwidget.h index 750b85b4c1..6eb2ab78fd 100644 --- a/src/widgets/itemviews/qlistwidget.h +++ b/src/widgets/itemviews/qlistwidget.h @@ -45,7 +45,7 @@ #include <QtWidgets/qlistview.h> #include <QtCore/qvariant.h> #include <QtCore/qvector.h> -#include <QtWidgets/qitemselectionmodel.h> +#include <QtCore/qitemselectionmodel.h> QT_BEGIN_HEADER diff --git a/src/widgets/util/qcompleter.cpp b/src/widgets/util/qcompleter.cpp index e99dd9ffc5..34db1b364b 100644 --- a/src/widgets/util/qcompleter.cpp +++ b/src/widgets/util/qcompleter.cpp @@ -147,7 +147,7 @@ #ifndef QT_NO_COMPLETER #include "QtWidgets/qscrollbar.h" -#include "QtWidgets/qstringlistmodel.h" +#include "QtCore/qstringlistmodel.h" #include "QtWidgets/qdirmodel.h" #include "QtWidgets/qfilesystemmodel.h" #include "QtWidgets/qheaderview.h" diff --git a/src/widgets/util/qcompleter_p.h b/src/widgets/util/qcompleter_p.h index 639c875568..78e201bd9e 100644 --- a/src/widgets/util/qcompleter_p.h +++ b/src/widgets/util/qcompleter_p.h @@ -59,7 +59,7 @@ #ifndef QT_NO_COMPLETER #include "QtWidgets/qtreeview.h" -#include "QtWidgets/qabstractproxymodel.h" +#include "QtCore/qabstractproxymodel.h" #include "qcompleter.h" #include "QtWidgets/qitemdelegate.h" #include "QtGui/qpainter.h" diff --git a/tests/auto/corelib/itemmodels/itemmodels.pro b/tests/auto/corelib/itemmodels/itemmodels.pro index c11a1f120b..c5124c3241 100644 --- a/tests/auto/corelib/itemmodels/itemmodels.pro +++ b/tests/auto/corelib/itemmodels/itemmodels.pro @@ -1,5 +1,10 @@ TEMPLATE=subdirs -SUBDIRS = qabstractitemmodel +SUBDIRS = qabstractitemmodel \ + qabstractproxymodel \ + qidentityproxymodel \ + qitemselectionmodel \ + qsortfilterproxymodel \ + qstringlistmodel mac: qabstractitemmodel.CONFIG = no_check_target # QTBUG-22748 diff --git a/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp b/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp index 2340c86207..199d96c0d1 100644 --- a/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp +++ b/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp @@ -42,8 +42,8 @@ #include <QtTest/QtTest> #include <QtCore/QtCore> -#include <QtWidgets/QSortFilterProxyModel> -#include <QtWidgets/QStringListModel> +#include <QtCore/QSortFilterProxyModel> +#include <QtCore/QStringListModel> #include "dynamictreemodel.h" diff --git a/tests/auto/widgets/itemviews/qabstractproxymodel/.gitignore b/tests/auto/corelib/itemmodels/qabstractproxymodel/.gitignore index bffc04d632..bffc04d632 100644 --- a/tests/auto/widgets/itemviews/qabstractproxymodel/.gitignore +++ b/tests/auto/corelib/itemmodels/qabstractproxymodel/.gitignore diff --git a/tests/auto/widgets/itemviews/qabstractproxymodel/qabstractproxymodel.pro b/tests/auto/corelib/itemmodels/qabstractproxymodel/qabstractproxymodel.pro index 5ded15ad5c..5ded15ad5c 100644 --- a/tests/auto/widgets/itemviews/qabstractproxymodel/qabstractproxymodel.pro +++ b/tests/auto/corelib/itemmodels/qabstractproxymodel/qabstractproxymodel.pro diff --git a/tests/auto/widgets/itemviews/qabstractproxymodel/tst_qabstractproxymodel.cpp b/tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp index b6557c45ec..b6557c45ec 100644 --- a/tests/auto/widgets/itemviews/qabstractproxymodel/tst_qabstractproxymodel.cpp +++ b/tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp diff --git a/tests/auto/widgets/itemviews/qidentityproxymodel/qidentityproxymodel.pro b/tests/auto/corelib/itemmodels/qidentityproxymodel/qidentityproxymodel.pro index 4fb8c98fe7..4fb8c98fe7 100644 --- a/tests/auto/widgets/itemviews/qidentityproxymodel/qidentityproxymodel.pro +++ b/tests/auto/corelib/itemmodels/qidentityproxymodel/qidentityproxymodel.pro diff --git a/tests/auto/widgets/itemviews/qidentityproxymodel/tst_qidentityproxymodel.cpp b/tests/auto/corelib/itemmodels/qidentityproxymodel/tst_qidentityproxymodel.cpp index 86ff00f9d4..86ff00f9d4 100644 --- a/tests/auto/widgets/itemviews/qidentityproxymodel/tst_qidentityproxymodel.cpp +++ b/tests/auto/corelib/itemmodels/qidentityproxymodel/tst_qidentityproxymodel.cpp diff --git a/tests/auto/widgets/itemviews/qitemselectionmodel/.gitignore b/tests/auto/corelib/itemmodels/qitemselectionmodel/.gitignore index aa543a200a..aa543a200a 100644 --- a/tests/auto/widgets/itemviews/qitemselectionmodel/.gitignore +++ b/tests/auto/corelib/itemmodels/qitemselectionmodel/.gitignore diff --git a/tests/auto/widgets/itemviews/qitemselectionmodel/qitemselectionmodel.pro b/tests/auto/corelib/itemmodels/qitemselectionmodel/qitemselectionmodel.pro index a4c7ba3786..a4c7ba3786 100644 --- a/tests/auto/widgets/itemviews/qitemselectionmodel/qitemselectionmodel.pro +++ b/tests/auto/corelib/itemmodels/qitemselectionmodel/qitemselectionmodel.pro diff --git a/tests/auto/widgets/itemviews/qitemselectionmodel/tst_qitemselectionmodel.cpp b/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp index 2097cb31ee..2097cb31ee 100644 --- a/tests/auto/widgets/itemviews/qitemselectionmodel/tst_qitemselectionmodel.cpp +++ b/tests/auto/corelib/itemmodels/qitemselectionmodel/tst_qitemselectionmodel.cpp diff --git a/tests/auto/widgets/itemviews/qsortfilterproxymodel/.gitignore b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/.gitignore index d3672fe4ae..d3672fe4ae 100644 --- a/tests/auto/widgets/itemviews/qsortfilterproxymodel/.gitignore +++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/.gitignore diff --git a/tests/auto/widgets/itemviews/qsortfilterproxymodel/qsortfilterproxymodel.pro b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/qsortfilterproxymodel.pro index d6e949f73d..d6e949f73d 100644 --- a/tests/auto/widgets/itemviews/qsortfilterproxymodel/qsortfilterproxymodel.pro +++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/qsortfilterproxymodel.pro diff --git a/tests/auto/widgets/itemviews/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp index cc8299e28f..cc8299e28f 100644 --- a/tests/auto/widgets/itemviews/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp +++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp diff --git a/tests/auto/widgets/itemviews/qstringlistmodel/.gitignore b/tests/auto/corelib/itemmodels/qstringlistmodel/.gitignore index 9c14561e3c..9c14561e3c 100644 --- a/tests/auto/widgets/itemviews/qstringlistmodel/.gitignore +++ b/tests/auto/corelib/itemmodels/qstringlistmodel/.gitignore diff --git a/tests/auto/widgets/itemviews/qstringlistmodel/qmodellistener.h b/tests/auto/corelib/itemmodels/qstringlistmodel/qmodellistener.h index f3ed3c1793..f3ed3c1793 100644 --- a/tests/auto/widgets/itemviews/qstringlistmodel/qmodellistener.h +++ b/tests/auto/corelib/itemmodels/qstringlistmodel/qmodellistener.h diff --git a/tests/auto/widgets/itemviews/qstringlistmodel/qstringlistmodel.pro b/tests/auto/corelib/itemmodels/qstringlistmodel/qstringlistmodel.pro index ecdd30cae2..ecdd30cae2 100644 --- a/tests/auto/widgets/itemviews/qstringlistmodel/qstringlistmodel.pro +++ b/tests/auto/corelib/itemmodels/qstringlistmodel/qstringlistmodel.pro diff --git a/tests/auto/widgets/itemviews/qstringlistmodel/tst_qstringlistmodel.cpp b/tests/auto/corelib/itemmodels/qstringlistmodel/tst_qstringlistmodel.cpp index c8afe5dd75..c8afe5dd75 100644 --- a/tests/auto/widgets/itemviews/qstringlistmodel/tst_qstringlistmodel.cpp +++ b/tests/auto/corelib/itemmodels/qstringlistmodel/tst_qstringlistmodel.cpp diff --git a/tests/auto/widgets/itemviews/itemviews.pro b/tests/auto/widgets/itemviews/itemviews.pro index fc338fdb7b..e13a5a82ca 100644 --- a/tests/auto/widgets/itemviews/itemviews.pro +++ b/tests/auto/widgets/itemviews/itemviews.pro @@ -1,23 +1,18 @@ TEMPLATE=subdirs SUBDIRS=\ qabstractitemview \ - qabstractproxymodel \ qcolumnview \ qdatawidgetmapper \ qdirmodel \ qfileiconprovider \ qheaderview \ - qidentityproxymodel \ qitemdelegate \ qitemeditorfactory \ - qitemselectionmodel \ qitemview \ qlistview \ qlistwidget \ - qsortfilterproxymodel \ qstandarditem \ qstandarditemmodel \ - qstringlistmodel \ qtableview \ qtablewidget \ qtreeview \ |