[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 2dbe09e36abaa33e4668115e76761cba1c2c645b
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 3 16:13:58 2009 +0000

    [Qt] Fix build of unit-test after r50454.
    
    Patch by Andras Becsi <becsi.andras at stud.u-szeged.hu> on 2009-11-03
    Reviewed by Simon Hausmann.
    
    * tests/qwebpage/tst_qwebpage.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50457 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 12deee2..338c606 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,11 @@
+2009-11-03  Andras Becsi  <becsi.andras at stud.u-szeged.hu>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Fix build of unit-test after r50454.
+
+        * tests/qwebpage/tst_qwebpage.cpp:
+
 2009-11-03  Simon Hausmann  <hausmann at webkit.org>
 
         Reviewed by Tor Arne Vestbø.
diff --git a/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp b/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
index bdc6e8e..6cbe2b1 100644
--- a/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
+++ b/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
@@ -1627,8 +1627,10 @@ void tst_QWebPage::originatingObjectInNetworkRequests()
     QList<QWebFrame*> childFrames = m_page->mainFrame()->childFrames();
     QCOMPARE(childFrames.count(), 2);
 
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
     for (int i = 0; i < 2; ++i)
         QVERIFY(qobject_cast<QWebFrame*>(networkManager->requests.at(i).originatingObject()) == childFrames.at(i));
+#endif
 }
 
 QTEST_MAIN(tst_QWebPage)

-- 
WebKit Debian packaging