diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-18 02:16:19 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-18 02:16:19 (GMT) |
| commit | 36c81f4972b5cfbac825d18e99d9a28dd82542d8 (patch) | |
| tree | 76ff8453d97ed99036e9ec956c25213822a5b3ad /src | |
| parent | d748ca2d6b07a31c3dd63cdebe987cc97131f1c7 (diff) | |
| parent | 3196c9e64dc3d966547bd0b38c440e55eb913479 (diff) | |
| download | Qt-36c81f4972b5cfbac825d18e99d9a28dd82542d8.zip Qt-36c81f4972b5cfbac825d18e99d9a28dd82542d8.tar.gz Qt-36c81f4972b5cfbac825d18e99d9a28dd82542d8.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:
Changed the localized vendor name for Qt SIS packages to "Nokia"
Diffstat (limited to 'src')
| -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\"" \ |