diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-05 01:00:07 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-12-05 10:09:17 +0100 |
| commit | 88490da44e8afa0f4d03ca79bcc928a14412ef99 (patch) | |
| tree | 41b40fe0f36c5ed49d0b8a2ce54421eb4dfbfd3b /src/qmlworkerscript/qquickworkerscript.cpp | |
| parent | 6ad3445f1e159d9beea936b66d267dcaacdc5d6c (diff) | |
| parent | e2af7c3b37095e601a84cc52de69a99af8e5d3a2 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
tests/auto/quick/qquicktableview/tst_qquicktableview.cpp
Change-Id: Ib46bc1c717cf524eea2fb3d876810c8d55747c91
Diffstat (limited to 'src/qmlworkerscript/qquickworkerscript.cpp')
0 files changed, 0 insertions, 0 deletions