harmonized with master
This commit is contained in:
parent
e14c72eca4
commit
8248ecdd90
|
@ -364,7 +364,6 @@ void QskDrawer::itemChange( QQuickItem::ItemChange change,
|
|||
m_data->resetListener( this );
|
||||
break;
|
||||
}
|
||||
|
||||
case QQuickItem::ItemVisibleHasChanged:
|
||||
{
|
||||
m_data->resetListener( this );
|
||||
|
|
|
@ -23,7 +23,7 @@ class QSK_EXPORT QskDrawer : public QskPopup
|
|||
WRITE setInteractive NOTIFY interactiveChanged )
|
||||
|
||||
public:
|
||||
QSK_SUBCONTROLS( Panel );
|
||||
QSK_SUBCONTROLS( Panel )
|
||||
|
||||
QskDrawer( QQuickItem* = nullptr );
|
||||
QskDrawer( Qt::Edge, QQuickItem* = nullptr );
|
||||
|
|
|
@ -20,7 +20,6 @@ QSK_QT_PRIVATE_BEGIN
|
|||
QSK_QT_PRIVATE_END
|
||||
|
||||
QSK_SUBCONTROL( QskPopup, Overlay )
|
||||
|
||||
QSK_SYSTEM_STATE( QskPopup, Closed, QskAspect::FirstSystemState << 1 )
|
||||
|
||||
static void qskSetFocus( QQuickItem* item, bool on )
|
||||
|
|
Loading…
Reference in New Issue