diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-03-21 11:43:47 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-03-21 11:43:47 +0100 |
| commit | 089e5f7822e6d64e8e5864806929d29fd735fb0d (patch) | |
| tree | bb0c4f173067e8a498c70e218f0b8c0c82a5525f /src/qml/qtqmlglobal.h | |
| parent | bc4455cda2ae395f2943cd9f18b6ae51a676399a (diff) | |
| parent | 1a816cd8dcc3499351ce6dfb6ad3bdfb34c31ede (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
tests/auto/qml/qjsengine/tst_qjsengine.cpp
Change-Id: I25e264df273c01832f64dbd31923d8529f1d1900
Diffstat (limited to 'src/qml/qtqmlglobal.h')
0 files changed, 0 insertions, 0 deletions