summaryrefslogtreecommitdiff
path: root/src/webenginewidgets/api/qwebenginescript.cpp
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-11-04 14:24:03 +0100
committerAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-11-04 14:24:03 +0100
commit14430b465d39a602d917f2a701218ed56360dc4e (patch)
treea05f4aadf195a3f78843fe9709e237ed06d98994 /src/webenginewidgets/api/qwebenginescript.cpp
parent10cd4401b9e4e9fde2a8e17c70a0d11d2dfc306f (diff)
parent215fe3b16d35f3a597658fd378d35bdb56116267 (diff)
downloadqtwebengine-14430b465d39a602d917f2a701218ed56360dc4e.tar.gz
Merge branch '5.5' into 5.6
Change-Id: Ibc8ec5ab77ef27bede6e4af1e6318378ac6b9899
Diffstat (limited to 'src/webenginewidgets/api/qwebenginescript.cpp')
0 files changed, 0 insertions, 0 deletions