diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-01-13 09:21:04 (GMT) |
|---|---|---|
| committer | Jesper Thomschutz <jesper.thomschutz@nokia.com> | 2010-01-14 09:34:38 (GMT) |
| commit | b126b0fd10dd65a20602f070fa3c347885ac8863 (patch) | |
| tree | b44b2377550ef0f52153f6081cf3847335b24763 | |
| parent | 5fb4a5d5736da6830d485e30752407ff9a28fd40 (diff) | |
| download | Qt-b126b0fd10dd65a20602f070fa3c347885ac8863.zip Qt-b126b0fd10dd65a20602f070fa3c347885ac8863.tar.gz Qt-b126b0fd10dd65a20602f070fa3c347885ac8863.tar.bz2 | |
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 8b9165d3bc84d1c8cc7df49a191cc3857b5530d4 )
Changes in WebKit/qt since the last update:
* Cherry-pick of http://trac.webkit.org/changeset/53181
( http://bugreports.qt.nokia.com/browse/QTBUG-7290 )
(cherry picked from commit dd62687182830aa353ef573f653fe913fd42a8d0)
| -rw-r--r-- | src/3rdparty/webkit/VERSION | 2 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebCore/ChangeLog | 12 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pro | 9 |
3 files changed, 22 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION index b69ac98..bc6d661 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 - bd6591b4acaf2172ab05702153ef539c0ac89cbb + 8b9165d3bc84d1c8cc7df49a191cc3857b5530d4 diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog index ab5b131..02daf86 100644 --- a/src/3rdparty/webkit/WebCore/ChangeLog +++ b/src/3rdparty/webkit/WebCore/ChangeLog @@ -1,3 +1,15 @@ +2010-01-13 Miikka Heikkinen <miikka.heikkinen@digia.com> + + Reviewed by Simon Hausmann. + + [Qt/Symbian] Added missing vendor information to qtwebkit.sis + + This information is necessary to Symbian sign the package. + + http://bugreports.qt.nokia.com/browse/QTBUG-7290 + + * WebCore.pro: + 2010-01-12 Jakub Wieczorek <faw217@gmail.com> Reviewed by Adam Barth. diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index 3eba696..9432217 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -9,6 +9,15 @@ symbian: { webkitlibs.sources = QtWebKit.dll webkitlibs.path = /sys/bin + vendorinfo = \ + "; Localised Vendor name" \ + "%{\"Nokia, Qt\"}" \ + " " \ + "; Unique Vendor name" \ + ":\"Nokia, Qt\"" \ + " " + webkitlibs.pkg_prerules = vendorinfo + DEPLOYMENT += webkitlibs TARGET.UID3 = 0x200267C2 |