summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-10-19 06:11:57 (GMT)
committeraxis <qt-info@nokia.com>2010-10-19 06:11:57 (GMT)
commit324f2d970674e6d4c2f6ed47ff30da593186c1b9 (patch)
tree29994688a43feedb6713946b6c004f86c608d7ea
parenta1b43a4f2c75a84c6b89d1e2a809df139d691939 (diff)
downloadQt-324f2d970674e6d4c2f6ed47ff30da593186c1b9.zip
Qt-324f2d970674e6d4c2f6ed47ff30da593186c1b9.tar.gz
Qt-324f2d970674e6d4c2f6ed47ff30da593186c1b9.tar.bz2
Fixed recursive sis file generation.
It broke for s60main after the partial upgrade targets were moved to qbase.pri. RevBy: Trust me
-rw-r--r--src/qbase.pri4
1 files 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" \