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

workaround for emit usages in qt headers

Browse Source
This commit is contained in:
Uwe Rathmann 2022-03-20 13:14:06 +01:00
parent 25e40103d3
commit 3bfdd9ed93
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/controls/QskGestureRecognizer.cpp
View File

@ -11,13 +11,15 @@
#include <qvector.h> #include <qvector.h>
QSK_QT_PRIVATE_BEGIN QSK_QT_PRIVATE_BEGIN
#include <private/qquickwindow_p.h> #include <private/qquickwindow_p.h>
QSK_QT_PRIVATE_END
#if QT_VERSION >= QT_VERSION_CHECK( 6, 3, 0 ) #if QT_VERSION >= QT_VERSION_CHECK( 6, 3, 0 )
#include <private/qeventpoint_p.h> #include <private/qeventpoint_p.h>
#endif #endif
QSK_QT_PRIVATE_END
static QMouseEvent* qskClonedMouseEventAt( static QMouseEvent* qskClonedMouseEventAt(
const QMouseEvent* event, QPointF* localPos ) const QMouseEvent* event, QPointF* localPos )
{ {

11
src/controls/QskQuickItem.cpp
View File

@ -15,16 +15,21 @@
#include <qquickwindow.h> #include <qquickwindow.h>
#if defined( QT_DEBUG ) #if defined( QT_DEBUG )
QSK_QT_PRIVATE_BEGIN QSK_QT_PRIVATE_BEGIN
#if QT_VERSION >= QT_VERSION_CHECK( 6, 2, 0 ) #if QT_VERSION >= QT_VERSION_CHECK( 6, 2, 0 )
#ifndef emit #ifndef emit
// qvariantanimation_p.h needs it
#define emit #define emit
#include <private/qabstractanimation_p.h>
#undef emit
#endif #endif
#endif #endif
#include <private/qquickpositioners_p.h> #include <private/qquickpositioners_p.h>
QSK_QT_PRIVATE_END QSK_QT_PRIVATE_END
#endif #endif
#include <unordered_set> #include <unordered_set>
@ -193,9 +198,9 @@ void QskQuickItem::classBegin()
void QskQuickItem::componentComplete() void QskQuickItem::componentComplete()
{ {
#if defined( QT_DEBUG ) #if defined( QT_DEBUG )
if ( qobject_cast< const QQuickBasePositioner* >( parent() ) ) if ( d_func()->updateFlags & QskQuickItem::DeferredLayout )
{ {
if ( d_func()->updateFlags & QskQuickItem::DeferredLayout ) if ( qobject_cast< const QQuickBasePositioner* >( parent() ) )
{ {
qWarning( "QskQuickItem in DeferredLayout mode under control of a positioner" ); qWarning( "QskQuickItem in DeferredLayout mode under control of a positioner" );
} }

5
src/controls/QskVariantAnimator.cpp
View File

@ -21,14 +21,17 @@
#include <qvariantanimation.h> #include <qvariantanimation.h>
QSK_QT_PRIVATE_BEGIN QSK_QT_PRIVATE_BEGIN
#if QT_VERSION >= QT_VERSION_CHECK( 6, 2, 0 ) #if QT_VERSION >= QT_VERSION_CHECK( 6, 2, 0 )
#ifndef emit #ifndef emit
// qvariantanimation_p.h needs it
#define emit #define emit
#include <private/qabstractanimation_p.h>
#undef emit
#endif #endif
#endif #endif
#include <private/qvariantanimation_p.h> #include <private/qvariantanimation_p.h>
QSK_QT_PRIVATE_END QSK_QT_PRIVATE_END
#if 1 #if 1