2009-09-21 Yael Aharon <yael.aharon@nokia.com>

Reviewed by Simon Hausmann. https://bugs.webkit.org/show_bug.cgi?id=29609 Build fix for windows when using Qt 4.5.0. * Api/qwebpage.cpp: (QWebPage::userAgentForUrl): Canonical link: https://commits.webkit.org/40160@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@48597 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Sep 21, 2009 · 1184e6c · 1184e6c
1 parent 5229358
commit 1184e6c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/WebKit/qt/Api/qwebpage.cpp b/WebKit/qt/Api/qwebpage.cpp
@@ -2909,9 +2909,11 @@ QString QWebPage::userAgentForUrl(const QUrl& url) const
         case QSysInfo::WV_VISTA:
             ver = "Windows NT 6.0";
             break;
+#if QT_VERSION > 0x040500
         case QSysInfo::WV_WINDOWS7:
             ver = "Windows NT 6.1";
             break;
+#endif
         case QSysInfo::WV_CE:
             ver = "Windows CE";
             break;

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
@@ -1,3 +1,13 @@
+2009-09-21  Yael Aharon  <yael.aharon@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        https://bugs.webkit.org/show_bug.cgi?id=29609
+        Build fix for windows when using Qt 4.5.0.
+
+        * Api/qwebpage.cpp:
+        (QWebPage::userAgentForUrl):
+
 2009-09-19  Benjamin Poulain  <benjamin.poulain@nokia.com>
 
         Reviewed by Simon Hausmann.