summaryrefslogtreecommitdiff
path: root/src/webengine/api/qquickwebenginescript.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-09-25 21:00:04 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2015-09-25 21:00:04 +0200
commit70558b6850ff6ca5289f5a0fbbd6729a72291cf3 (patch)
tree3b6bfe06fa42cf2b5dff2a0b3aa35ff4e3912854 /src/webengine/api/qquickwebenginescript.cpp
parent20a9f5093f2c9e22e859930fde3cef5ee09dbb87 (diff)
parent76c7af60c351cacbce01c89b7e2e7f1df536c7aa (diff)
downloadqtwebengine-70558b6850ff6ca5289f5a0fbbd6729a72291cf3.tar.gz
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: Id512a24a77e2ae1126d39bc004f0920ff3561dbc
Diffstat (limited to 'src/webengine/api/qquickwebenginescript.cpp')
0 files changed, 0 insertions, 0 deletions