diff options
author | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:30:13 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:30:13 +0200 |
commit | 059fc10f8f70a65265a27c354322099806d23d7e (patch) | |
tree | 21c2df3684d2d6807344e480f9631871308049a6 /tests/auto/bic/data/QtScriptTools.5.7.0.linux-gcc-amd64.txt | |
parent | 9461103e4e88d652adbcd1790a21f087a1fccc53 (diff) | |
parent | 52873703412bce5d295a1351d32b0f72fb4bedd9 (diff) | |
download | qtscript-059fc10f8f70a65265a27c354322099806d23d7e.tar.gz |
Merge remote-tracking branch 'origin/5.7' into devv5.8.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I524e6344bd57ea073c233cfc912bd4969415940d
Diffstat (limited to 'tests/auto/bic/data/QtScriptTools.5.7.0.linux-gcc-amd64.txt')
0 files changed, 0 insertions, 0 deletions