diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-05 09:47:19 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-05 09:47:19 +0200 |
| commit | d5bb02ffe04b9b5ca7d86c8b905b352cc265df32 (patch) | |
| tree | 83831d332763c1974e512de14cfc2757b89a5d84 /src/render/backend/render-backend.pri | |
| parent | 4bbdcc1fac6b21a6d4607c93a5f8759145248f07 (diff) | |
| parent | 79aeeba87d3c17b4f652423a660a213f9e2faf25 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
tests/manual/manual.pro
Change-Id: Ie1186d3465516d8d50b8261f72e64d8d454d377b
Diffstat (limited to 'src/render/backend/render-backend.pri')
0 files changed, 0 insertions, 0 deletions