Changeset 80424 in webkit

Timestamp:

Mar 5, 2011 9:32:09 AM (13 years ago)

Author:

qi.2.zhang@nokia.com

Message:

2011-03-05 Qi Zhang <​qi.2.zhang@nokia.com>

Reviewed by Laszlo Gombos.

[Qt] Mobile Devices should include Model and Firmware Version in Webkit Generated User Agent String
​https://bugs.webkit.org/show_bug.cgi?id=48636

Add model infomation into user agent string when qtmobility is available, but only for symbian, Maemo and MeeGo.

• WebCore.pri:
• features.pri:

2011-03-05 Qi Zhang <​qi.2.zhang@nokia.com>

Reviewed by Laszlo Gombos.

[Qt] Mobile Devices should include Model and Firmware Version in Webkit Generated User Agent String
​https://bugs.webkit.org/show_bug.cgi?id=48636

Add model infomation into user agent string when qtmobility is available, but only for symbian, Maemo and MeeGo.

• Api/qwebpage.cpp: (QWebPage::userAgentForUrl):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.pri (modified) (1 diff)
• WebCore/features.pri (modified) (1 diff)
• WebKit/qt/Api/qwebpage.cpp (modified) (6 diffs)
• WebKit/qt/ChangeLog (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-05  Qi Zhang  <qi.2.zhang@nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt] Mobile Devices should include Model and Firmware Version in Webkit Generated User Agent String
+        https://bugs.webkit.org/show_bug.cgi?id=48636
+
+        Add model infomation into user agent string when qtmobility is available, but only for symbian, Maemo and MeeGo.
+
+        * WebCore.pri:
+        * features.pri:
+
 2011-03-05  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/Source/WebCore/WebCore.pri

@@ -230 +230 @@
 }
 
+contains(DEFINES, ENABLE_QT_USERAGENT_DEVICEMODEL=1) {
+     CONFIG *= mobility
+     MOBILITY *= systeminfo
+}
+
 contains(DEFINES, ENABLE_QT_BEARER=1) {
     # Bearer management is part of Qt 4.7, so don't accidentially

trunk/Source/WebCore/features.pri

@@ -130 +130 @@
    CONFIG *= mobility
    MOBILITY *= sensors
+}
+
+# systeminfo support if QtMobility systeminfo module exists, but only for symbian, maemo and meego
+symbian|maemo5|maemo6 {
+    !CONFIG(QTDIR_build):!contains(DEFINES, ENABLE_QT_USERAGENT_DEVICEMODEL=.) {
+        contains(MOBILITY_CONFIG, systeminfo) {
+            DEFINES += QT_USERAGENT_DEVICEMODEL=1
+        }
+    }
 }
 

trunk/Source/WebKit/qt/Api/qwebpage.cpp

@@ -141 +141 @@
 #include <QX11Info>
 #endif
-
+#if ENABLE(QT_USERAGENT_DEVICEMODEL)
+#include <qsysteminfo.h>
+#endif
 
 using namespace WebCore;
@@ -3720 +3722 @@
 #elif defined Q_WS_QWS
         "QtEmbedded; "
+#elif defined Q_WS_MAEMO_5
+        "Maemo"
+#elif defined Q_WS_MAEMO_6
+        "MeeGo"
 #elif defined Q_WS_WIN
         // Nothing
@@ -3839 +3845 @@
         firstPartTemp += QString::fromLatin1("SGI Irix");
 #elif defined Q_OS_LINUX
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
 
 #if defined(__x86_64__)
@@ -3846 +3853 @@
 #else
         firstPartTemp += QString::fromLatin1("Linux");
+#endif
 #endif
 
@@ -3896 +3904 @@
 #endif
 
+#if ENABLE(QT_USERAGENT_DEVICEMODEL)
+        // adding Model Number
+        QtMobility::QSystemDeviceInfo systemDeviceInfo;
+
+        QString model = systemDeviceInfo.model();
+        if (!model.isEmpty()) {
+            if (!firstPartTemp.endsWith("; "))
+                firstPartTemp += QString::fromLatin1("; ");
+            firstPartTemp += systemDeviceInfo.model();
+        }
+#endif
         firstPartTemp.squeeze();
         firstPart = firstPartTemp;
@@ -3915 +3934 @@
         QString thirdPartTemp;
         thirdPartTemp.reserve(150);
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5)
+#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
         thirdPartTemp += QLatin1String(" Mobile Safari/");
 #else

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2011-03-05  Qi Zhang  <qi.2.zhang@nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt] Mobile Devices should include Model and Firmware Version in Webkit Generated User Agent String
+        https://bugs.webkit.org/show_bug.cgi?id=48636
+
+        Add model infomation into user agent string when qtmobility is available, but only for symbian, Maemo and MeeGo.
+
+        * Api/qwebpage.cpp:
+        (QWebPage::userAgentForUrl):
+
 2011-03-03  Mahesh Kulkarni  <mahesh.kulkarni@nokia.com>