diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-02-01 13:00:18 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-02-01 13:00:18 +0100 |
| commit | 2b9859c87cef698bbcfd59048be76d2499587f5c (patch) | |
| tree | c200712b9f3b2e58fcceec15b2b943f4e4bff76e /src/qml/compiler/qv4compilerscanfunctions.cpp | |
| parent | 5d8d0d7068bc8498ea2a6a4c9bc16e0eeb92836c (diff) | |
| parent | a566125b9fcc023237b442e5b9a838d40455c8fe (diff) | |
| download | qtdeclarative-2b9859c87cef698bbcfd59048be76d2499587f5c.tar.gz | |
Merge remote-tracking branch 'origin/5.12.1' into 5.12
Conflicts:
src/quick/handlers/qquickpinchhandler.cpp
Change-Id: I1f3618ceb93049623d6bf3a208b037c33d9d1f0c
Diffstat (limited to 'src/qml/compiler/qv4compilerscanfunctions.cpp')
0 files changed, 0 insertions, 0 deletions