summaryrefslogtreecommitdiff
path: root/src/webengine/api/qquickwebenginescript.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-09-18 11:08:43 +0200
committerLiang Qi <liang.qi@qt.io>2016-09-18 11:08:43 +0200
commit099ffa623920355f3a70402ddfa49dd1a3ecb2f0 (patch)
tree97fbbf9bdbf606301575da3b3f8336fc75e892f0 /src/webengine/api/qquickwebenginescript.cpp
parentd6c8a2cf8fa374e6d1c0a578391b57112c047fa4 (diff)
parent9c0bd9207560e36e7bad3657e02305aabd7638b9 (diff)
downloadqtwebengine-099ffa623920355f3a70402ddfa49dd1a3ecb2f0.tar.gz
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I2452f25335174d0e0c15a9e069fe50e1d92db1b8
Diffstat (limited to 'src/webengine/api/qquickwebenginescript.cpp')
0 files changed, 0 insertions, 0 deletions