summaryrefslogtreecommitdiff
path: root/src/webengine/api/qtwebengineglobal.cpp
diff options
context:
space:
mode:
authorPierre Rossi <pierre.rossi@digia.com>2014-10-09 17:55:18 +0200
committerPierre Rossi <pierre.rossi@digia.com>2014-10-09 18:12:08 +0200
commitc2ad449616b5c863a27ddb7388d78aee6b68b893 (patch)
treed4fc7cc374048627c082ddb846f56149c41c0541 /src/webengine/api/qtwebengineglobal.cpp
parenta0bd967d820f075128cd913d39334da47aac3f97 (diff)
parentd609bdf73958d30a6ec8a1097f595f68c7422804 (diff)
downloadqtwebengine-c2ad449616b5c863a27ddb7388d78aee6b68b893.tar.gz
Merge remote-tracking branch 'origin/1.0' into dev
Change-Id: Ibd678c267a3aa136b4c7c660c3b36ba8b8ce5325
Diffstat (limited to 'src/webengine/api/qtwebengineglobal.cpp')
0 files changed, 0 insertions, 0 deletions