summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2010-05-30 21:47:57 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2010-05-30 21:47:57 (GMT)
commit4bdd6722218ce2afb11b3b12e261f81d41aef82f (patch)
tree5733d3feec9e854548c599893334ffb53eaa6af9 /src/3rdparty
parent6da180b5cd20afbc5f376a9055756839e6f25861 (diff)
downloadQt-4bdd6722218ce2afb11b3b12e261f81d41aef82f.zip
Qt-4bdd6722218ce2afb11b3b12e261f81d41aef82f.tar.gz
Qt-4bdd6722218ce2afb11b3b12e261f81d41aef82f.tar.bz2
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 3bb0df4f00fa0b3ac3abc1b6fe508080fabdeaab )
Changes in WebKit/qt since the last update: * [Qt] Update the Symbian version for the user agent -- https://bugs.webkit.org/show_bug.cgi?id=38389
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/webkit/VERSION2
-rw-r--r--src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp38
2 files changed, 28 insertions, 12 deletions
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION
index a6fb502..8a524b8 100644
--- a/src/3rdparty/webkit/VERSION
+++ b/src/3rdparty/webkit/VERSION
@@ -8,4 +8,4 @@ The commit imported was from the
and has the sha1 checksum
- ecee9d7244ce4f7e7acf723bcef535532780db5f
+ 3bb0df4f00fa0b3ac3abc1b6fe508080fabdeaab
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
index 97a4e4e..5fb64a7 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
@@ -3071,6 +3071,8 @@ QWebPluginFactory *QWebPage::pluginFactory() const
The default implementation returns the following value:
"Mozilla/5.0 (%Platform%; %Security%; %Subplatform%; %Locale%) AppleWebKit/%WebKitVersion% (KHTML, like Gecko) %AppVersion Safari/%WebKitVersion%"
+
+ On mobile platforms such as Symbian S60 and Maemo, "Mobile Safari" is used instead of "Safari".
In this string the following values are replaced at run-time:
\list
@@ -3097,7 +3099,7 @@ QString QWebPage::userAgentForUrl(const QUrl& url) const
#elif defined Q_WS_X11
"X11"
#elif defined Q_OS_SYMBIAN
- "SymbianOS"
+ "Symbian"
#else
"Unknown"
#endif
@@ -3164,7 +3166,7 @@ QString QWebPage::userAgentForUrl(const QUrl& url) const
#elif defined Q_OS_ULTRIX
"DEC Ultrix"
#elif defined Q_WS_S60
- "Series60"
+ ""
#elif defined Q_OS_UNIX
"UNIX BSD/SYSV system"
#elif defined Q_OS_UNIXWARE
@@ -3181,16 +3183,25 @@ QString QWebPage::userAgentForUrl(const QUrl& url) const
QSysInfo::SymbianVersion symbianVersion = QSysInfo::symbianVersion();
switch (symbianVersion) {
case QSysInfo::SV_9_2:
- osVer = "/9.2";
+ osVer = "OS/9.2";
break;
case QSysInfo::SV_9_3:
- osVer = "/9.3";
+ osVer = "OS/9.3";
break;
case QSysInfo::SV_9_4:
- osVer = "/9.4";
+ osVer = "OS/9.4";
+ break;
+ case QSysInfo::SV_SF_2:
+ osVer = "/2";
+ break;
+ case QSysInfo::SV_SF_3:
+ osVer = "/3";
+ break;
+ case QSysInfo::SV_SF_4:
+ osVer = "/4";
break;
default:
- osVer = "Unknown";
+ osVer = "";
}
#endif
ua = ua.arg(osVer);
@@ -3259,20 +3270,20 @@ QString QWebPage::userAgentForUrl(const QUrl& url) const
// SubPlatform Version
QString subPlatformVer;
-#ifdef Q_OS_SYMBIAN
+#ifdef Q_WS_S60
QSysInfo::S60Version s60Version = QSysInfo::s60Version();
switch (s60Version) {
case QSysInfo::SV_S60_3_1:
- subPlatformVer = "/3.1";
+ subPlatformVer = "Series60/3.1";
break;
case QSysInfo::SV_S60_3_2:
- subPlatformVer = "/3.2";
+ subPlatformVer = "Series60/3.2";
break;
case QSysInfo::SV_S60_5_0:
- subPlatformVer = "/5.0";
+ subPlatformVer = "Series60/5.0";
break;
default:
- subPlatformVer = " Unknown";
+ subPlatformVer = "";
}
#endif
ua = ua.arg(subPlatformVer);
@@ -3305,8 +3316,13 @@ QString QWebPage::userAgentForUrl(const QUrl& url) const
ua.append(QLatin1String(qVersion()));
}
+#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5)
+ ua.append(QString(QLatin1String(" Mobile Safari/%1"))
+ .arg(qWebKitVersion()));
+#else
ua.append(QString(QLatin1String(" Safari/%1"))
.arg(qWebKitVersion()));
+#endif
return ua;
}