summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-02-18 02:16:19 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-02-18 02:16:19 (GMT)
commit36c81f4972b5cfbac825d18e99d9a28dd82542d8 (patch)
tree76ff8453d97ed99036e9ec956c25213822a5b3ad /src/3rdparty
parentd748ca2d6b07a31c3dd63cdebe987cc97131f1c7 (diff)
parent3196c9e64dc3d966547bd0b38c440e55eb913479 (diff)
downloadQt-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/3rdparty')
-rw-r--r--src/3rdparty/webkit/WebCore/WebCore.pro2
1 files changed, 1 insertions, 1 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\"" \