diff options
| author | Tasuku Suzuki <tasuku.suzuki@signal-slot.co.jp> | 2023-01-16 14:03:24 +0900 |
|---|---|---|
| committer | Tasuku Suzuki <tasuku.suzuki@signal-slot.co.jp> | 2023-01-17 08:03:57 +0900 |
| commit | 8c99531cdc63fccff229f3603ae8b24807273593 (patch) | |
| tree | e4230ed2866bb9680f384219d964e115f78aa40b | |
| parent | 301d5deb1bf2e09976337ab517f5ef7834c1c3b2 (diff) | |
Fix build with -no-feature-transposeproxymodel
Pick-to: 6.5
Change-Id: I65c6632f9631e2c28a8c66bd04ca2079b36b33e2
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| -rw-r--r-- | src/quicktemplates/qquickheaderview.cpp | 4 | ||||
| -rw-r--r-- | src/quicktemplates/qquickheaderview_p_p.h | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/quicktemplates/qquickheaderview.cpp b/src/quicktemplates/qquickheaderview.cpp index 5be4d52dc3..9c9f0ffc43 100644 --- a/src/quicktemplates/qquickheaderview.cpp +++ b/src/quicktemplates/qquickheaderview.cpp @@ -158,8 +158,10 @@ QVariant QQuickHeaderViewBasePrivate::modelImpl() const { if (auto model = m_headerDataProxyModel.sourceModel()) return QVariant::fromValue(model.data()); +#if QT_CONFIG(transposeproxymodel) if (auto model = m_transposeProxyModel.sourceModel()) return QVariant::fromValue(model); +#endif return QQuickTableViewPrivate::modelImpl(); } @@ -189,10 +191,12 @@ void QQuickHeaderViewBasePrivate::setModelImpl(const QVariant &newModel) // Case 1: newModel is QAbstractTableModel if (proxyModelSetter(q, m_headerDataProxyModel, newModel.value<QAbstractTableModel *>())) return; +#if QT_CONFIG(transposeproxymodel) // Case 2: newModel is QAbstractItemModel but not QAbstractTableModel if (orientation() == Qt::Horizontal && proxyModelSetter(q, m_transposeProxyModel, newModel.value<QAbstractItemModel *>())) return; +#endif QQuickTableViewPrivate::setModelImpl(newModel); } diff --git a/src/quicktemplates/qquickheaderview_p_p.h b/src/quicktemplates/qquickheaderview_p_p.h index 32be4bde78..fe33cb0190 100644 --- a/src/quicktemplates/qquickheaderview_p_p.h +++ b/src/quicktemplates/qquickheaderview_p_p.h @@ -17,7 +17,9 @@ #include <QtCore/QAbstractItemModel> #include <QtCore/QPointer> +#if QT_CONFIG(transposeproxymodel) #include <QtCore/QTransposeProxyModel> +#endif #include <QtQuick/private/qquicktableview_p_p.h> #include <private/qquickheaderview_p.h> @@ -71,7 +73,9 @@ public: protected: QHeaderDataProxyModel m_headerDataProxyModel; +#if QT_CONFIG(transposeproxymodel) QTransposeProxyModel m_transposeProxyModel; +#endif struct SectionSize { int section; |