diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-03 01:00:05 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-03-03 12:23:20 +0100 |
| commit | 04e3918f0fd0c19ed830d406e1c549a037089cc4 (patch) | |
| tree | 8e07ee9c550124b277983542e2ad0f7a791b5276 /src/quick/handlers/qquickpointerhandler_p_p.h | |
| parent | b760d972459fd3b0c41e4c85076fa933ba5c0d1d (diff) | |
| parent | 254a56252874b63430701351dcd8c9bef8507353 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/qmlmodels/qqmltableinstancemodel.cpp
src/qmlmodels/qqmltableinstancemodel_p.h
Change-Id: I89339b1cb41ba27fe30c79530859a1c2bfbecc69
Diffstat (limited to 'src/quick/handlers/qquickpointerhandler_p_p.h')
0 files changed, 0 insertions, 0 deletions