From 4fefe62ad0b95d4c08c787170377db59e747aecc Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Fri, 23 Oct 2020 13:41:18 +0200 Subject: [PATCH] Qt6 changes for QList/QVector disaallow forward declarations, but as with every qobject.h we have qlist.h anyway --- src/controls/QskControl.h | 4 +++- src/controls/QskFocusIndicator.h | 4 +++- src/controls/QskSkinlet.h | 6 +++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/controls/QskControl.h b/src/controls/QskControl.h index 07a4e8df..713ecc00 100644 --- a/src/controls/QskControl.h +++ b/src/controls/QskControl.h @@ -18,7 +18,9 @@ class QskControlPrivate; class QskGestureEvent; -template< typename T > class QVector; +#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) + template< typename T > class QVector; +#endif class QSK_EXPORT QskControl : public QskQuickItem, public QskSkinnable { diff --git a/src/controls/QskFocusIndicator.h b/src/controls/QskFocusIndicator.h index 7c2d32f8..0b0aae59 100644 --- a/src/controls/QskFocusIndicator.h +++ b/src/controls/QskFocusIndicator.h @@ -8,7 +8,9 @@ #include "QskControl.h" -template< typename T > class QVector; +#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) + template< typename T > class QVector; +#endif class QSK_EXPORT QskFocusIndicator : public QskControl { diff --git a/src/controls/QskSkinlet.h b/src/controls/QskSkinlet.h index 2fe96071..f4f82900 100644 --- a/src/controls/QskSkinlet.h +++ b/src/controls/QskSkinlet.h @@ -4,7 +4,7 @@ *****************************************************************************/ #ifndef QSK_SKINLET_H -#define QSK_SKINLET_H 1 +#define QSK_SKINLET_H #include "QskAspect.h" @@ -27,6 +27,10 @@ class QRectF; class QRect; class QSize; +#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) + template< typename T > class QVector; +#endif + class QSK_EXPORT QskSkinlet { Q_GADGET