diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-27 09:44:16 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-27 09:44:16 (GMT) |
| commit | 53f5b448f5dd33459837536a855463c917b4c14e (patch) | |
| tree | 33aaebb5e05dc056de5b7f733ad0ee9589ebcba2 /src/corelib | |
| parent | 0ec3281f7deb9a0c5bdc26481bf5c0fb8d3ae750 (diff) | |
| parent | a8d405f470edb41b868142879a978d8976bc766a (diff) | |
| download | Qt-53f5b448f5dd33459837536a855463c917b4c14e.zip Qt-53f5b448f5dd33459837536a855463c917b4c14e.tar.gz Qt-53f5b448f5dd33459837536a855463c917b4c14e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Moved the partial deployment section to qbase.pri.
Made the Symbian menu close when switching native focus.
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/corelib.pro | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index 728bdf9..b7d6034 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -36,21 +36,6 @@ symbian: { # Workaroud for problems with paging this dll MMP_RULES -= PAGED MMP_RULES *= UNPAGED - - # Partial upgrade SIS file - vendorinfo = \ - "; 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 = $$QMAKE_LIBDIR_QT/QtCore$${QT_LIBINFIX}.dll - partial_upgrade.path = c:/sys/bin - DEPLOYMENT = partial_upgrade $$DEPLOYMENT } neon { |