From a1b43a4f2c75a84c6b89d1e2a809df139d691939 Mon Sep 17 00:00:00 2001
From: axis <qt-info@nokia.com>
Date: Tue, 19 Oct 2010 08:10:54 +0200
Subject: Readded DESTDIR that was removed by mistake in a3c755e358596.

RevBy:    Trust me
---
 src/s60installs/s60installs.pro | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
index d63b97c..9559da6 100644
--- a/src/s60installs/s60installs.pro
+++ b/src/s60installs/s60installs.pro
@@ -35,6 +35,8 @@ symbian: {
     }
     VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
 
+    DESTDIR = $$QMAKE_LIBDIR_QT
+
     qtlibraries.sources = \
         $$QMAKE_LIBDIR_QT/QtCore$${QT_LIBINFIX}.dll \
         $$QMAKE_LIBDIR_QT/QtXml$${QT_LIBINFIX}.dll \
-- 
cgit v0.12


From 324f2d970674e6d4c2f6ed47ff30da593186c1b9 Mon Sep 17 00:00:00 2001
From: axis <qt-info@nokia.com>
Date: Tue, 19 Oct 2010 08:11:57 +0200
Subject: Fixed recursive sis file generation.

It broke for s60main after the partial upgrade targets were moved to
qbase.pri.

RevBy:    Trust me
---
 src/qbase.pri | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/qbase.pri b/src/qbase.pri
index e565e4a..a44dca5 100644
--- a/src/qbase.pri
+++ b/src/qbase.pri
@@ -185,8 +185,8 @@ include(qt_targets.pri)
 win32:DEFINES+=_USE_MATH_DEFINES
 
 symbian {
-    # Make partial upgrade SIS file for all dll's except webkit
-    !contains(TARGET.UID3, 0x200267C2):!contains(TARGET.UID3, 0xE00267C2) {
+    # Make partial upgrade SIS file for all dll's except webkit and s60main
+    !contains(TARGET.UID3, 0x200267C2):!contains(TARGET.UID3, 0xE00267C2):!contains(TARGET.UID3, 0x2001E61F):!contains(TARGET.UID3, 0xE001E61F) {
         # Partial upgrade SIS file
         vendorinfo = \
             "; Localised Vendor name" \
-- 
cgit v0.12


From 8786224d413f35c65939b7f378fd69cb327b5f27 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Tue, 19 Oct 2010 10:35:03 +0300
Subject: Fix partial upgrade package UID for libinfixed Qt

Libinfixed Qt has different UID than regular Qt, so partial upgrades
of individual Qt libraries didn't work right when the UID was hardcoded
to regular Qt UID.

Reviewed-by: Janne Anttila
---
 src/qbase.pri | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/qbase.pri b/src/qbase.pri
index a44dca5..4217618 100644
--- a/src/qbase.pri
+++ b/src/qbase.pri
@@ -195,8 +195,11 @@ symbian {
             "; Unique Vendor name" \
             ":\"Nokia, Qt\"" \
             " "
+        isEmpty(QT_LIBINFIX): PARTIAL_UPGRADE_UID = 0x2001E61C
+        else: PARTIAL_UPGRADE_UID = 0xE001E61C
+
         pu_header = "; Partial upgrade package for testing $${TARGET} changes without reinstalling everything" \
-                    "$${LITERAL_HASH}{\"$${TARGET}\"}, (0x2001E61C), $${QT_MAJOR_VERSION},$${QT_MINOR_VERSION},$${QT_PATCH_VERSION}, TYPE=PU"
+                    "$${LITERAL_HASH}{\"$${TARGET}\"}, ($$PARTIAL_UPGRADE_UID), $${QT_MAJOR_VERSION},$${QT_MINOR_VERSION},$${QT_PATCH_VERSION}, TYPE=PU"
         partial_upgrade.pkg_prerules = pu_header vendorinfo
         partial_upgrade.sources = $$QMAKE_LIBDIR_QT/$${TARGET}.dll
         partial_upgrade.path = c:/sys/bin
-- 
cgit v0.12