diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-06-01 06:48:50 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-06-01 06:48:50 (GMT) |
| commit | 70ba57c4716749c99e302a4eda4695942d0b45fe (patch) | |
| tree | a59cd703b68ed7e484232410c157cc63a33f232e /src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp | |
| parent | 15f331834833e34c1faf437b6fe3d3ef58691651 (diff) | |
| parent | 450508cf9a19473644de20e64bb1098050806182 (diff) | |
| download | Qt-70ba57c4716749c99e302a4eda4695942d0b45fe.zip Qt-70ba57c4716749c99e302a4eda4695942d0b45fe.tar.gz Qt-70ba57c4716749c99e302a4eda4695942d0b45fe.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp')
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp index a61ca2e..564c6fe 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp @@ -3620,7 +3620,7 @@ QString QWebPage::userAgentForUrl(const QUrl&) const languageName = d->client->ownerWidget()->locale().name(); else languageName = QLocale().name(); - languageName[2] = QLatin1Char('-'); + languageName.replace(QLatin1Char('_'), QLatin1Char('-')); // Application name/version QString appName = QCoreApplication::applicationName(); |