diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-25 11:01:35 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-25 11:01:35 +0200 |
| commit | a955ff06fff32a63766a142ea7dd7dcf7261fc6e (patch) | |
| tree | b7af9a8c3d0de3d318b3b70760c2b47f6183187f /src | |
| parent | c5c7c2091385e4f6177516e464dcf617d863f2d0 (diff) | |
| parent | dd490a7fe2628ee965719b33dfde5484e672933a (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
.qmake.conf
Change-Id: Ibd223399be3a6fd5442d5c141e8b285f168e2a42
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions