diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-01-29 12:18:53 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-01-29 12:37:04 +0100 |
| commit | 8ec2403603f82e7a0d43b4de04c97ef1c7f1ad35 (patch) | |
| tree | d7099d5a7cf813f378064ef0348647f4e68b2692 /src/quick/handlers/qquickpinchhandler_p.h | |
| parent | 15525d2a309a6028d548797bc777e38905f36c46 (diff) | |
| parent | 454676a8745a7334539449562a5fda47db2fc2ca (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/3rdparty/masm/yarr/YarrJIT.cpp
src/qml/compiler/qv4instr_moth.cpp
src/quick/handlers/qquicksinglepointhandler_p.h
src/quick/handlers/qquicktaphandler.cpp
src/quick/items/context2d/qquickcontext2d.cpp
Done-With: Ulf Hermann <ulf.hermann@qt.io>
Change-Id: I109453131f9f0a05316ae37c7d6ed1edc8c0f9d4
Diffstat (limited to 'src/quick/handlers/qquickpinchhandler_p.h')
| -rw-r--r-- | src/quick/handlers/qquickpinchhandler_p.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/quick/handlers/qquickpinchhandler_p.h b/src/quick/handlers/qquickpinchhandler_p.h index 8f24d18166..b9e2cbf48f 100644 --- a/src/quick/handlers/qquickpinchhandler_p.h +++ b/src/quick/handlers/qquickpinchhandler_p.h @@ -150,10 +150,9 @@ private: qreal m_startDistance = 0; QPointF m_startPos; qreal m_accumulatedStartCentroidDistance = 0; - QVector<PointData> m_startAngles; - QMatrix4x4 m_startMatrix; QQuickMatrix4x4 m_transform; + QMatrix4x4 m_startMatrix; }; QT_END_NAMESPACE |