Remove bool trap in QDockWidgetPrivate::endDrag()

endDrag(false) meant to end a drag with a dock location change.
endDrag(true) meant to abort a drag without a dock location change.

Replace this with a meaningful enumeration.
Define a dummy enum for builds w/o QDockWidget.

Task-number: QTBUG-118578
Task-number: QTBUG-118579
Pick-to: 6.6 6.5
Change-Id: I786f4210f5a3ee67ffcf0dc9285f77a480148569
Reviewed-by: David Faure <david.faure@kdab.com>

1 files changed, 6 insertions, 1 deletions

diff --git a/src/widgets/widgets/qdockwidget_p.h b/src/widgets/widgets/qdockwidget_p.h
index 72cf08177f..b768f11e2c 100644
--- a/src/widgets/widgets/qdockwidget_p.h
+++ b/src/widgets/widgets/qdockwidget_p.h
@@ -56,6 +56,11 @@ public:
         Widget
     };
 
+    enum class EndDragMode {
+        LocationChange,
+        Abort
+    };
+
     void init();
     void toggleView(bool);
     void toggleTopLevel();
@@ -92,7 +97,7 @@ public:
     void nonClientAreaMouseEvent(QMouseEvent *event);
     void initDrag(const QPoint &pos, bool nca);
     void startDrag(DragScope scope);
-    void endDrag(bool abort = false);
+    void endDrag(EndDragMode mode);
     void moveEvent(QMoveEvent *event);
     void recalculatePressPos(QResizeEvent *event);