Changeset 799 for trunk/src

Timestamp:

Oct 19, 2010, 2:22:18 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

webkit: Added proper OS/2 version reporting to the UserAgent string (closes #175).

File:

• trunk/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp (modified) (7 diffs)

trunk/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp

@@ -1784 +1784 @@
             d->client = 0;
         } else {
-            if (!d->client) 
+            if (!d->client)
                 d->client = new QWebPageWidgetClient(view);
             else
@@ -3072 +3072 @@
 
     "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".
 
@@ -3101 +3101 @@
 #elif defined Q_OS_SYMBIAN
     "Symbian"
+#elif defined Q_OS_OS2
+    "OS/2"
 #else
     "Unknown"
@@ -3147 +3149 @@
     "NetBSD"
 #elif defined Q_OS_OS2
-    "OS/2"
+    "%3"
 #elif defined Q_OS_OPENBSD
     "OpenBSD"
@@ -3201 +3203 @@
         osVer = "/4";
         break;
-    default: 
+    default:
         osVer = "";
     }
@@ -3265 +3267 @@
             ver = "Windows CE 6.x";
             break;
+    }
+    ua = QString(ua).arg(ver);
+#endif
+
+#if defined Q_OS_OS2
+    QString ver;
+    switch (QSysInfo::os2Version()) {
+        default:
+        case QSysInfo::OV_Unknown:
+            ver = QLatin1String("Unknown"); break;
+        case QSysInfo::OV_2_0:
+            ver = QLatin1String("2.0"); break;
+        case QSysInfo::OV_2_1:
+            ver = QLatin1String("2.1"); break;
+        case QSysInfo::OV_2_11:
+            ver = QLatin1String("2.11"); break;
+        case QSysInfo::OV_3_0:
+            ver = QLatin1String("Warp 3"); break;
+        case QSysInfo::OV_4_0:
+            ver = QLatin1String("Warp 4"); break;
+        case QSysInfo::OV_4_5:
+            ver = QLatin1String("Warp 4.5"); break;
+        case QSysInfo::OV_4_52:
+            ver = QLatin1String("Warp 4.52"); break;
+        case QSysInfo::OV_ECS_Unknown:
+            ver = QLatin1String("eCS"); break;
+        case QSysInfo::OV_ECS_1_0:
+            ver = QLatin1String("eCS 1.0"); break;
+        case QSysInfo::OV_ECS_1_1:
+            ver = QLatin1String("eCS 1.1"); break;
+        case QSysInfo::OV_ECS_1_2:
+            ver = QLatin1String("eCS 1.2"); break;
+        case QSysInfo::OV_ECS_2_0:
+            ver = QLatin1String("eCS 2.0"); break;
     }
     ua = QString(ua).arg(ver);
@@ -3283 +3319 @@
         subPlatformVer = "Series60/5.0";
         break;
-    default: 
+    default:
         subPlatformVer = "";
     }