diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:30:17 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:30:17 +0100 |
| commit | e117cfe3be46ccb82b0b3a9674d65ffb0f49e4df (patch) | |
| tree | fd1681da9e3919dd71ddabdc333c68999f08cac1 /src/styles/styles.pro | |
| parent | 51f7bb2dab3737670da4fb7bc94d5b437a07fc27 (diff) | |
| parent | 21558bcead96716607e670840c63213d6eb4d8c9 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta2
Conflicts:
.qmake.conf
Change-Id: I9736fec7c5a429ade0a8d801a0d4fb8de3ef70c4
Diffstat (limited to 'src/styles/styles.pro')
0 files changed, 0 insertions, 0 deletions