diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-12 01:00:58 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-12 12:00:31 +0200 |
| commit | b0a4c4808f54a2cbe64a75f1a5a341be420b584c (patch) | |
| tree | d71f43142497c03df9fe7826b52512c4ed2153ef /src/quick/doc/images/sg-renderloop-threaded.jpg | |
| parent | 47ad6c57d1873c3da362cfad7cc81dc0aa2720a4 (diff) | |
| parent | f3d40896c1d8601703fcbf30214e22f50eb72727 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Required a change to a #include; qquicksinglepointhandler.cpp was (at
least on Android) only seeing QQuickSinglePointHandler as a forward
declaration, so dereferencing it was a problem. The header that
defines it does #include the one it replaces here.
Change-Id: I6bc30ff9a91f55350172e4a4bcaaa7f99a2ffb28
Diffstat (limited to 'src/quick/doc/images/sg-renderloop-threaded.jpg')
0 files changed, 0 insertions, 0 deletions