diff options
author | Liang Qi <[email protected]> | 2016-11-28 12:16:17 +0000 |
---|---|---|
committer | The Qt Project <[email protected]> | 2016-11-28 12:16:17 +0000 |
commit | 4e1463c20aa6ec52f23e1e5f6426b68edb2255f0 (patch) | |
tree | df3d8f65f0c8df1990c48931c4c0b5063ff6f8c6 /src/quick/items/qquicktextdocument.cpp | |
parent | ea9d6955f4c1c1141d0909ddb32abb59c032ac3c (diff) | |
parent | 9044800083ccffe4d0b732f8b3b60512f32d8f8a (diff) |
Merge "Merge remote-tracking branch 'origin/5.7' into 5.8" into refs/staging/5.8
Diffstat (limited to 'src/quick/items/qquicktextdocument.cpp')
0 files changed, 0 insertions, 0 deletions