lp:~neon/qtwebkit/dev

Branch merges

This import branch has no branches proposed for merge into it.

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

258. By Oswald Buddenhagen <email address hidden> on 2015-02-24

Bump version

Change-Id: I49061494fbb1dae82d2873aa103b018b605f4116

257. By Jani Heikkinen <email address hidden> on 2015-02-16

Update copyright headers

Qt copyrights are now in The Qt Company, so we could update the source
code headers accordingly. In the same go we should also fix the links to
point to qt.io.

Change-Id: Icc6f774c9ca37ea88ac024163386b16fc50fb2a7
Reviewed-by: Andras Becsi <email address hidden>
Reviewed-by: Allan Sandfeld Jensen <email address hidden>

256. By Frederik Gladhorn <email address hidden> on 2015-02-16

Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
 .qmake.conf

Change-Id: Ib6552c4dd0fbfecfa1800689eb2ae75b9d54a22b

255. By Julien Brianceau <email address hidden> on 2015-02-09

Fix lots of crashes because of 4th argument register trampling.

https://bugs.webkit.org/show_bug.cgi?id=123421

Reviewed by Michael Saboff.

r3 register is the 4th argument register for ARM and also a scratch
register in the baseline JIT for this architecture. We can use r6
instead, as this used to be the timeoutCheckRegister and it is no
longer used since r148119.

* assembler/ARMAssembler.h: Temp register is now r6 instead of r3 for ARM.
* assembler/MacroAssemblerARMv7.h: Temp register is now r6 instead of r3 for ARMv7.
* dfg/DFGGPRInfo.h: Add r3 properly in GPRInfo for ARM.
* jit/JITStubs.cpp: Remove obsolete timeoutCheckRegister init.
* yarr/YarrJIT.cpp: Use r3 and not the new scratch register r6 and r8 register
doesn't need to be saved.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@158208 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Change-Id: I5198a158e5e69d4e3a05b353abb60f28c0ab095e
Reviewed-by: Allan Sandfeld Jensen <email address hidden>

254. By Florian Bruhin <email address hidden> on 2015-01-27

Add QWebHitTestResult::linkTitleString().

QWebHitTestResult::linkTitle returned the link title as an (invalid) QUrl.

Since the return type can not be changed before Qt 6, it is now obsolete and
replaced by a linkTitleString method with a correct (QString) return type.

Task-number: QTBUG-44052
Change-Id: I0636de3112eac19942db7c29c7cc5b8a0ac1e05a
Reviewed-by: Michael Brüning <email address hidden>
Reviewed-by: Allan Sandfeld Jensen <email address hidden>

253. By Frederik Gladhorn <email address hidden> on 2015-01-19

Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev

252. By Allan Sandfeld Jensen <email address hidden> on 2015-01-13

Add support authenticated POST requests

To resend a POST request on authentication challenge we need to be able
to reset the FormData IODevice so it can give the same data again to
QtNetwork.

Task-number: QTBUG-43628
Change-Id: Icc0a25f45dee80240501b18f1e3f61af022552d1
Reviewed-by: Jocelyn Turcotte <email address hidden>

251. By Allan Sandfeld Jensen <email address hidden> on 2015-01-08

Map CSS font-weights to new QFont enums

Fixes the selection of light font for weight 300, and adds mapping
for the rest of the values that was added in Qt 5.5.

Change-Id: Ic92e61bc9e452d44328ac05ad5c9a2b15fceb91e
Reviewed-by: Pierre Rossi <email address hidden>

250. By Allan Sandfeld Jensen <email address hidden> on 2014-12-03

Use deepbind when loading plugins.

This patch adds the deepbind option when loading plugins. This allows
us to load plugins linked against different library versions, especially
plugins linked against Qt 4. It is not recursive though, and plugins
loading subplugins must still be blacklisted.

Change-Id: Id4f86dc01c1712a08eb4828a852f8a0733eaf899
Reviewed-by: Jocelyn Turcotte <email address hidden>

249. By Frederik Gladhorn <email address hidden> on 2014-11-27

Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: I075d973264e841fea66d9cd64af72132cffcc0a6