summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorGiuseppe D'Angelo <dangelog@gmail.com>2011-09-12 18:43:21 +0200
committerQt by Nokia <qt-info@nokia.com>2011-09-12 20:59:47 +0200
commit5b414f73d60f94c0119df844c6c850af6b882662 (patch)
tree7b39d9b342e91c3343f33f57b61975222859b9d6 /src/plugins
parent0192bf919fe03ac8e85190fa1c09720339eb9dd2 (diff)
Fix QNetworkReply::errorString returning an untranslated string
The QHttpNetworkConnectionPrivate::errorDetail is supposed to return a translated string, which is then set as the QNetworkReply error. The current code incorrectly uses QT_TRANSLATE_NOOP, which mark the strings for translation, but does not translate them. The result is that even with a translator loaded those strings are written in English. Fixes QTBUG-18382. Merge-request: 2671 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit 434686a926a2a6e71f3cdea2508898b7800f7c81) Change-Id: I8673cef7671d41106f50b75e78394916f3b720c9 Reviewed-on: http://codereview.qt-project.org/4691 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/plugins')
0 files changed, 0 insertions, 0 deletions