diff options
| author | Benjamin Poulain <benjamin.poulain@nokia.com> | 2010-02-23 18:45:41 +0100 |
|---|---|---|
| committer | Benjamin Poulain <benjamin.poulain@nokia.com> | 2010-02-23 18:45:41 +0100 |
| commit | 615972e09981a0916422716b4f6572c6401789da (patch) | |
| tree | 82203c15bceebd5426c823852ef5c85ad025e92b /src/corelib/corelib.pro | |
| parent | 60fd302e8d88b92ade59d68872c99310128c3a6c (diff) | |
| parent | de4332a4728e739b37e9c7b04c021e150e096270 (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1
Diffstat (limited to 'src/corelib/corelib.pro')
| -rw-r--r-- | src/corelib/corelib.pro | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index 4bffd0f260..df9a463634 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -35,8 +35,22 @@ symbian: { # Workaroud for problems with paging this dll MMP_RULES -= PAGED MMP_RULES *= UNPAGED - # Timezone server - LIBS += -ltzclient + + # Partial upgrade SIS file + vendorinfo = \ + "&EN" \ + "; Localised Vendor name" \ + "%{\"Nokia, Qt\"}" \ + " " \ + "; Unique Vendor name" \ + ":\"Nokia, Qt\"" \ + " " + pu_header = "; Partial upgrade package for testing QtCore changes without reinstalling everything" \ + "$${LITERAL_HASH}{\"Qt corelib\"}, (0x2001E61C), $${QT_MAJOR_VERSION},$${QT_MINOR_VERSION},$${QT_PATCH_VERSION}, TYPE=PU" + partial_upgrade.pkg_prerules = pu_header vendorinfo + partial_upgrade.sources = qtcore.dll + partial_upgrade.path = c:/sys/bin + DEPLOYMENT = partial_upgrade $$DEPLOYMENT } mmx { |