diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-18 21:07:31 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-18 21:08:35 +0100 |
| commit | 9055bd56653d2e488b52c66d884109fcccd23c2d (patch) | |
| tree | 5d44f00ae54587d98b3b715811e4bbb0b4a91c77 | |
| parent | 5f80f66d3b5878bba021d4ac67e35388bfe84fdb (diff) | |
| parent | 1838b75f6c21d71e7bd88b03e44c07287879a4e8 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.11v5.11.0-beta1
Conflicts:
.qmake.conf
Change-Id: Ic33e523570bd1e7801fa9515b907bed912ba53ba
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -31,6 +31,8 @@ Makefile* *.html *~ .qmake.* +*.jsc +*.qmlc tst_* !tst_*.* |