Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt

11 files changed, 202 insertions, 20 deletions
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION
index 26ce489..9f85d76 100644
--- a/src/3rdparty/webkit/VERSION
+++ b/src/3rdparty/webkit/VERSION
@@ -8,4 +8,4 @@ The commit imported was from the
 
 and has the sha1 checksum
 
-        a6ebe3865025e2bb4d767a79435af4daf5a9b4db
+        7b8d6ab6f2b73862d11c2a41ab0223e55585d88f
diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog
	Commit message (Expand)	Author	Age	Files	Lines
*	Help: Improve formatting of variable documentation	James Johnston	2015-08-21	1	-5/+5

*	try_compile: Propogate the CMAKE_LINK_SEARCH_ variables	Chuck Atkins	2015-08-14	1	-2/+3

*	Allow LINK_SEARCH_{START,END}_STATIC props to have default values.	Chuck Atkins	2015-08-13	1	-0/+19