diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 20:43:25 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 20:43:25 +0100 |
| commit | 05808fb8b011c760a2af6dd520b781447db4a0ba (patch) | |
| tree | 2319d622b05c7ff70e2e3874ace5ecd0aec75531 /tests | |
| parent | 307cd0ed678b37395f02bfb11fd58f8d000da6af (diff) | |
| parent | 450651e8155bbdec44253a9c282ec385257b2f8a (diff) | |
| download | qtactiveqt-05808fb8b011c760a2af6dd520b781447db4a0ba.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I06247d29c4b05020e91bb377a7f93e5374184f47
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions