diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-16 23:16:25 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-16 23:16:25 +0200 |
| commit | d148019f16e3c95916731e59e0324e7c470cc1fc (patch) | |
| tree | d9c0640c9055f24379468b8f55b3419f30a37c47 /src/widgets/widgets/qtabbar.cpp | |
| parent | 8ceab12814a7437a01d917c83ec28fd6e81c459e (diff) | |
| parent | 6b9c57f8cd3df65702db327616913fa9d8172237 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp
Change-Id: I0af32ee55936d523cbd259b6fe82eb9c409f9074
Diffstat (limited to 'src/widgets/widgets/qtabbar.cpp')
| -rw-r--r-- | src/widgets/widgets/qtabbar.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/widgets/widgets/qtabbar.cpp b/src/widgets/widgets/qtabbar.cpp index 11700fe6f1..e51f484f6f 100644 --- a/src/widgets/widgets/qtabbar.cpp +++ b/src/widgets/widgets/qtabbar.cpp @@ -1958,9 +1958,8 @@ void QTabBar::mouseMoveEvent(QMouseEvent *event) } } - int offset = (event->pos() - d->dragStartPosition).manhattanLength(); if (event->buttons() == Qt::LeftButton - && offset > QApplication::startDragDistance() + && d->dragInProgress && d->validIndex(d->pressedIndex)) { bool vertical = verticalTabs(d->shape); int dragDistance; |