diff options
author | Liang Qi <liang.qi@qt.io> | 2018-02-02 09:51:15 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-02-02 09:51:16 +0100 |
commit | efc5564c19f3b15eb9a7b0022d201c866a9cf216 (patch) | |
tree | 26fdf65efabf7fc29f566cba71792506e8693dbe /tests/auto/font/data/inheritance-childpopup.qml | |
parent | 5d27e14e4ca49263d9c3309b5e93d4cb386063cc (diff) | |
parent | 223c1524a7693e2c0f2312dd738c6aeb484358a5 (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I6450d9ea1e5e2081e5ed79f02d485515b582c4f0
Diffstat (limited to 'tests/auto/font/data/inheritance-childpopup.qml')
0 files changed, 0 insertions, 0 deletions