diff options
author | Eckhart Koppen <eckhart.koppen@nokia.com> | 2011-02-17 15:49:48 (GMT) |
---|---|---|
committer | Eckhart Koppen <eckhart.koppen@nokia.com> | 2011-02-18 07:56:26 (GMT) |
commit | 648338402c2345e5627f0800d6954519f9782847 (patch) | |
tree | 666b233fb355e781d4b2896b8b77bb8a365c3512 | |
parent | 2207cd088e85073e2ed8552e139fc2158e71ea8b (diff) | |
download | Qt-648338402c2345e5627f0800d6954519f9782847.zip Qt-648338402c2345e5627f0800d6954519f9782847.tar.gz Qt-648338402c2345e5627f0800d6954519f9782847.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
(cherry picked from commit a8a84f1667966acfa093c4be0b7d4b0900ddd3d9)
-rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pro | 2 | ||||
-rw-r--r-- | src/qbase.pri | 2 | ||||
-rw-r--r-- | src/s60installs/s60installs.pro | 2 |
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 43cfd6b..1e5ce0f 100644 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -75,7 +75,7 @@ symbian: { vendorinfo = \ "; Localised Vendor name" \ - "%{\"Nokia, Qt\"}" \ + "%{\"Nokia\"}" \ " " \ "; Unique Vendor name" \ ":\"Nokia, Qt\"" \ |