peranger/qskinny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Qt6 incompatibilities fixed

Browse Source
This commit is contained in:
Uwe Rathmann 2021-03-02 17:09:38 +01:00
parent 6c9cbcad62
commit fd218e6b2e
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/controls/QskGestureRecognizer.cpp
View File

@ -57,7 +57,7 @@ static inline QMouseEvent* qskClonedMouseEvent(
static void qskGrabTouchMouse( QQuickItem* item ) static void qskGrabTouchMouse( QQuickItem* item )
{ {
#if QT_VERSION >= QT_VERSION_CHECK( 5, 8, 0 ) #if QT_VERSION >= QT_VERSION_CHECK( 5, 8, 0 ) && QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
auto wd = QQuickWindowPrivate::get( item->window() ); auto wd = QQuickWindowPrivate::get( item->window() );
if ( wd->touchMouseDevice == nullptr ) if ( wd->touchMouseDevice == nullptr )

4
src/controls/QskQuickItem.cpp
View File

@ -860,11 +860,15 @@ void QskQuickItem::touchUngrabEvent()
Inherited::touchUngrabEvent(); Inherited::touchUngrabEvent();
} }
#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
void QskQuickItem::windowDeactivateEvent() void QskQuickItem::windowDeactivateEvent()
{ {
Inherited::windowDeactivateEvent(); Inherited::windowDeactivateEvent();
} }
#endif
void QskQuickItem::updatePolish() void QskQuickItem::updatePolish()
{ {
Q_D( QskQuickItem ); Q_D( QskQuickItem );

3
src/controls/QskQuickItem.h
View File

@ -133,7 +133,10 @@ class QSK_EXPORT QskQuickItem : public QQuickItem
void mouseUngrabEvent() override; void mouseUngrabEvent() override;
void touchUngrabEvent() override; void touchUngrabEvent() override;
#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
void windowDeactivateEvent() override; void windowDeactivateEvent() override;
#endif
void itemChange( ItemChange, const ItemChangeData& ) override; void itemChange( ItemChange, const ItemChangeData& ) override;
#if QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) #if QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 )