Changeset 83620 in webkit

Timestamp:

Apr 12, 2011 12:17:06 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-12 George Guo <​George.Guo@nokia.com>

Reviewed by Laszlo Gombos.

[Qt] On Symbian got "Update Error" when installing QtWebkit.sis
​http://bugs.webkit.org/show_bug.cgi?id=58141

If QtWebKit is already in Symbian ROM, we need package to be
both SA and RU type

• QtWebKit.pro:

Location:

trunk/Source/WebKit/qt

Files:

• ChangeLog (modified) (1 diff)
• QtWebKit.pro (modified) (2 diffs)

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2011-04-12  George Guo  <George.Guo@nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt] On Symbian got "Update Error" when installing QtWebkit.sis
+        http://bugs.webkit.org/show_bug.cgi?id=58141
+
+        If QtWebKit is already in Symbian ROM, we need package to be
+        both SA and RU type
+
+        * QtWebKit.pro:
+
 2011-04-12  Alexis Menard  <alexis.menard@openbossa.org>
 

trunk/Source/WebKit/qt/QtWebKit.pro

@@ -105 +105 @@
         TARGET.UID3 = 0xE00267C2
     }
+    
+    sisheader = "; SIS header: name, uid, version" \
+                "$${LITERAL_HASH}{\"$$TARGET\"},($$TARGET.UID3),$$QT_WEBKIT_MAJOR_VERSION,$$QT_WEBKIT_MINOR_VERSION,$$QT_WEBKIT_PATCH_VERSION,TYPE=SA,RU"
+    webkitsisheader.pkg_prerules = sisheader
+
     webkitlibs.sources = QtWebKit$${QT_LIBINFIX}.dll
     v8:webkitlibs.sources += v8.dll
@@ -129 +134 @@
     }
 
-    DEPLOYMENT += webkitlibs webkitbackup
+    DEPLOYMENT += webkitsisheader webkitlibs webkitbackup
     !CONFIG(production):CONFIG-=def_files