diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-18 08:55:15 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-18 08:56:11 +0200 |
| commit | 13f4c129c2ba12956a6105bd57f407cc07708ca1 (patch) | |
| tree | e92a180d0e8c96f6de7488bbd2af58e7923c0069 /tests/auto/auto.pro | |
| parent | a4c96742f5166d6354f2ac22233d4679d12ec3ae (diff) | |
| parent | 95b51b007efdec4994f9c0e01b3a9609ffdedf21 (diff) | |
| download | qtscript-13f4c129c2ba12956a6105bd57f407cc07708ca1.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta3
Conflicts:
.qmake.conf
qtscript.pro
Change-Id: If0f8875c8af2afb717ba394fac4e506076f01517
Diffstat (limited to 'tests/auto/auto.pro')
0 files changed, 0 insertions, 0 deletions