diff options
| author | Liang Qi <[email protected]> | 2016-06-13 09:04:09 +0200 |
|---|---|---|
| committer | Liang Qi <[email protected]> | 2016-06-13 19:06:06 +0200 |
| commit | 4d2f743baaf6869693f4540df668e1b998154785 (patch) | |
| tree | ba712b420e5d299be28faf641d30585ae8dce4e7 /src/quick/items/qquickmousearea_p_p.h | |
| parent | 0c5a9ff9876cb1af53317720d1de8baae003e21d (diff) | |
| parent | 0932a59971f606f07b41da19f3974d51b7008180 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp
Change-Id: I26d6435a29cac3840bb567ade5149c2562a94bf9
Diffstat (limited to 'src/quick/items/qquickmousearea_p_p.h')
| -rw-r--r-- | src/quick/items/qquickmousearea_p_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quick/items/qquickmousearea_p_p.h b/src/quick/items/qquickmousearea_p_p.h index 794a8cc6ff..b59e02910f 100644 --- a/src/quick/items/qquickmousearea_p_p.h +++ b/src/quick/items/qquickmousearea_p_p.h @@ -93,6 +93,7 @@ public: bool doubleClick : 1; bool preventStealing : 1; bool propagateComposedEvents : 1; + bool overThreshold : 1; Qt::MouseButtons pressed; #ifndef QT_NO_DRAGANDDROP QQuickDrag *drag; |