[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 74758928d5944ea2d215e56fa35208e57ca687e0
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 21 20:54:41 2009 +0000

    2009-09-21  Yael Aharon  <yael.aharon at 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):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48597 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebpage.cpp b/WebKit/qt/Api/qwebpage.cpp
index 98c0770..a27a3ef 100644
--- 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
index 4393205..84706b4 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,13 @@
+2009-09-21  Yael Aharon  <yael.aharon at 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 at nokia.com>
 
         Reviewed by Simon Hausmann.

-- 
WebKit Debian packaging