Merge branch '1.3'

2021-05-20 18:54:18 +01:00
parent 4e8a9ff8ed 913cc16371
commit 7fb5a8d444
1 changed files with 1 additions and 1 deletions
--- a/src/private/DragController.cpp
+++ b/src/private/DragController.cpp
@@ -249,7 +249,7 @@ bool StatePreDrag::handleMouseDoubleClick()
 StateDragging::StateDragging(DragController *parent)
    : StateBase(parent)
 {
-#if defined(Q_OS_WIN)
+#if defined(Q_OS_WIN) && !defined(DOCKS_DEVELOPER_MODE)
    m_maybeCancelDrag.setInterval(100);
    QObject::connect(&m_maybeCancelDrag, &QTimer::timeout, this, [this] {
        // Workaround bug #166 , where Qt doesn't agree with Window's mouse button state.