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/qbase.pri | |
| 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/qbase.pri')
| -rw-r--r-- | src/qbase.pri | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/qbase.pri b/src/qbase.pri index 680693f..b431ade 100644 --- a/src/qbase.pri +++ b/src/qbase.pri @@ -183,3 +183,20 @@ QMAKE_PKGCONFIG_VARIABLES += moc_dir uic_dir rcc_dir lupdate_dir lrelease_dir include(qt_targets.pri) win32:DEFINES+=_USE_MATH_DEFINES + +symbian { + # Partial upgrade SIS file + vendorinfo = \ + "; Localised Vendor name" \ + "%{\"Nokia, Qt\"}" \ + " " \ + "; Unique Vendor name" \ + ":\"Nokia, Qt\"" \ + " " + 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" + partial_upgrade.pkg_prerules = pu_header vendorinfo + partial_upgrade.sources = $$QMAKE_LIBDIR_QT/$${TARGET}.dll + partial_upgrade.path = c:/sys/bin + DEPLOYMENT += partial_upgrade +} |