diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 21:17:21 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 21:17:21 +0100 |
| commit | a9bad172f62fe1dda280df5477a8b7c1bd57690d (patch) | |
| tree | a22948b7300a57902a6e46d5346104e32c898e64 /tests/auto/qml | |
| parent | 9507cdc31ff6778cba77764bb0991e538c493a9e (diff) | |
| parent | e777ff1f88e58c1b47044ac83aafa8ccafa3840f (diff) | |
| download | qtwebchannel-a9bad172f62fe1dda280df5477a8b7c1bd57690d.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I42bfb38e5a9bf03b43636309fe9e29e8d772bb06
Diffstat (limited to 'tests/auto/qml')
0 files changed, 0 insertions, 0 deletions