summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEckhart Koppen <eckhart.koppen@nokia.com>2011-02-17 15:49:48 (GMT)
committerEckhart Koppen <eckhart.koppen@nokia.com>2011-02-17 15:49:48 (GMT)
commita8a84f1667966acfa093c4be0b7d4b0900ddd3d9 (patch)
tree1c3bba62ce0fe9d3e4b51fe09ee2e1ee5ebeea50
parent48e7ac0eee8beb9d2c597ff5fa3c913d56ffb9b0 (diff)
downloadQt-a8a84f1667966acfa093c4be0b7d4b0900ddd3d9.zip
Qt-a8a84f1667966acfa093c4be0b7d4b0900ddd3d9.tar.gz
Qt-a8a84f1667966acfa093c4be0b7d4b0900ddd3d9.tar.bz2
Changed the localized vendor name for Qt SIS packages to "Nokia"
The previously used name "Nokia, Qt" was not usable for Nokia Content Signing, which only allows "Nokia" as the visible vendor name. The unique vendor ID remains as "Nokia, Qt" Reviewed-by: TrustMe
-rw-r--r--src/3rdparty/webkit/WebCore/WebCore.pro2
-rw-r--r--src/qbase.pri2
-rw-r--r--src/s60installs/s60installs.pro2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro
index 981dba2..37d216d 100644
--- a/src/3rdparty/webkit/WebCore/WebCore.pro
+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
@@ -15,7 +15,7 @@ symbian: {
webkitlibs.path = /sys/bin
vendorinfo = \
"; Localised Vendor name" \
- "%{\"Nokia, Qt\"}" \
+ "%{\"Nokia\"}" \
" " \
"; Unique Vendor name" \
":\"Nokia, Qt\"" \
diff --git a/src/qbase.pri b/src/qbase.pri
index 3a40928..75da3dc 100644
--- a/src/qbase.pri
+++ b/src/qbase.pri
@@ -190,7 +190,7 @@ symbian {
# Partial upgrade SIS file
vendorinfo = \
"; Localised Vendor name" \
- "%{\"Nokia, Qt\"}" \
+ "%{\"Nokia\"}" \
" " \
"; Unique Vendor name" \
":\"Nokia, Qt\"" \
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
index c282b1e..98a9ea9 100644
--- a/src/s60installs/s60installs.pro
+++ b/src/s60installs/s60installs.pro
@@ -92,7 +92,7 @@ symbian: {
vendorinfo = \
"; Localised Vendor name" \
- "%{\"Nokia, Qt\"}" \
+ "%{\"Nokia\"}" \
" " \
"; Unique Vendor name" \
":\"Nokia, Qt\"" \