diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-10 21:10:21 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-02-10 22:35:04 +0100 |
| commit | 364b161122b567e3a6f7343d438fb540b9fb7e5c (patch) | |
| tree | 3d49953be9a58295a8c956cf5fdb00f581020605 /src/widgets/widgets/qmainwindowlayout_p.h | |
| parent | e58401a75b29beb38d37a40072106d5ef7cb0336 (diff) | |
| parent | 8a410f60ae39b06555d807581caf7cb8bfab4fac (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/widgets/widgets/qmainwindowlayout_p.h
Change-Id: Id406a67606b885052ed405b0fbc8eea7d9d03224
Diffstat (limited to 'src/widgets/widgets/qmainwindowlayout_p.h')
| -rw-r--r-- | src/widgets/widgets/qmainwindowlayout_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/widgets/widgets/qmainwindowlayout_p.h b/src/widgets/widgets/qmainwindowlayout_p.h index 94706d2347..507759fe96 100644 --- a/src/widgets/widgets/qmainwindowlayout_p.h +++ b/src/widgets/widgets/qmainwindowlayout_p.h @@ -305,18 +305,20 @@ public: #endif #ifndef QT_NO_DOCKWIDGET QPointer<QWidget> currentHoveredFloat; // set when dragging over a floating dock widget + void setCurrentHoveredFloat(QWidget *w); #endif void hover(QLayoutItem *widgetItem, const QPoint &mousePos); bool plug(QLayoutItem *widgetItem); QLayoutItem *unplug(QWidget *widget, bool group = false); void revert(QLayoutItem *widgetItem); - void updateGapIndicator(); + void paintDropIndicator(QPainter *p, QWidget *widget, const QRegion &clip); void applyState(QMainWindowLayoutState &newState, bool animate = true); void restore(bool keepSavedState = false); void animationFinished(QWidget *widget); private Q_SLOTS: + void updateGapIndicator(); #ifndef QT_NO_DOCKWIDGET #ifndef QT_NO_TABBAR void tabChanged(); |