[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[jocelyn.turcotte at nokia.com]

The following commit has been merged in the webkit-1.1 branch:
commit 89fedd3f9fd72091050640a164a5973f9e0399b5
Author: jocelyn.turcotte at nokia.com <jocelyn.turcotte at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 12 09:59:34 2010 +0000

    [Qt] Fix standalone build with MinGW.
    
    Reviewed by nobody, build fix.
    
    * tests/qwebelement/tst_qwebelement.cpp:
    * tests/tests.pri:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54711 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 0ef415b..b618430 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-09  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
+
+        Reviewed by nobody, build fix.
+
+        [Qt] Fix standalone build with MinGW.
+
+        * tests/qwebelement/tst_qwebelement.cpp:
+        * tests/tests.pri:
+
 2010-02-10  Diego Gonzalez  <diego.gonzalez at openbossa.org>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp b/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp
index dde65cf..8db0ec3 100644
--- a/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp
+++ b/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp
@@ -18,13 +18,13 @@
 */
 
 
-#include <../util.h>
 #include <QtTest/QtTest>
 #include <qwebpage.h>
 #include <qwidget.h>
 #include <qwebview.h>
 #include <qwebframe.h>
 #include <qwebelement.h>
+#include <util.h>
 //TESTED_CLASS=
 //TESTED_FILES=
 
diff --git a/WebKit/qt/tests/tests.pri b/WebKit/qt/tests/tests.pri
index c3d7755..b9fedea 100644
--- a/WebKit/qt/tests/tests.pri
+++ b/WebKit/qt/tests/tests.pri
@@ -3,6 +3,7 @@ CONFIG -= app_bundle
 
 TARGET = tst_$$TARGET
 SOURCES += $$_PRO_FILE_PWD_/$${TARGET}.cpp
+INCLUDEPATH += $$PWD
 
 exists($$_PRO_FILE_PWD_/$${TARGET}.qrc):RESOURCES += $$_PRO_FILE_PWD_/$${TARGET}.qrc
 

-- 
WebKit Debian packaging