[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 2a432420f66448e99951da9771ea01face6ce436
Author: jocelyn.turcotte at nokia.com <jocelyn.turcotte at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 12 10:02:40 2010 +0000

    [Qt] Make qtlauncher and qgvlauncher use the generated headers
    path to make sure they are correctly generated.
    
    Reviewed by Tor Arne Vestbo.
    
    .:
    
    * WebKit.pri:
    
    WebCore:
    
    * WebCore.pro:
    
    WebKit\qt:
    
    * tests/tests.pri:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54715 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index c53778e..9ff2307 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,15 @@
 
         Reviewed by Tor Arne Vestbø.
 
+        [Qt] Make qtlauncher and qgvlauncher use the generated headers
+        path to make sure they are correctly generated.
+
+        * WebKit.pri:
+
+2010-02-10  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
+
+        Reviewed by Tor Arne Vestbø.
+
         [Qt] Manually add support for the install target on Symbian.
 
         This is required to copy the headers over the ones in Qt.
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 596b63e..59c0d4c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,15 @@
 
         Reviewed by Tor Arne Vestbø.
 
+        [Qt] Make qtlauncher and qgvlauncher use the generated headers
+        path to make sure they are correctly generated.
+
+        * WebCore.pro:
+
+2010-02-10  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
+
+        Reviewed by Tor Arne Vestbø.
+
         [Qt] Ensure relative paths in generated .pri files to ensure that
         a source package with pre-generated derived sources can be compiled.
 
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index eb6f1df..13d6314 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -213,6 +213,7 @@ INCLUDEPATH = \
     $$PWD/platform/graphics/qt \
     $$PWD/platform/network/qt \
     $$PWD/platform/qt \
+    $$PWD/../WebKit/qt/Api \
     $$PWD/../WebKit/qt/WebCoreSupport \
     $$INCLUDEPATH
 
diff --git a/WebKit.pri b/WebKit.pri
index 0dd0799..907a92c 100644
--- a/WebKit.pri
+++ b/WebKit.pri
@@ -60,7 +60,7 @@ CONFIG(release, debug|release) {
 }
 
 BASE_DIR = $$PWD
-INCLUDEPATH += $$PWD/WebKit/qt/Api
+INCLUDEPATH += $$OUTPUT_DIR/include/QtWebKit
 
 CONFIG -= warn_on
 *-g++*:QMAKE_CXXFLAGS += -Wall -Wreturn-type -fno-strict-aliasing -Wcast-align -Wchar-subscripts -Wformat-security -Wreturn-type -Wno-unused-parameter -Wno-sign-compare -Wno-switch -Wno-switch-enum -Wundef -Wmissing-noreturn -Winit-self
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 5b8545b..0656388 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -2,6 +2,15 @@
 
         Reviewed by Tor Arne Vestbø.
 
+        [Qt] Make qtlauncher and qgvlauncher use the generated headers
+        path to make sure they are correctly generated.
+
+        * tests/tests.pri:
+
+2010-02-10  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
+
+        Reviewed by Tor Arne Vestbø.
+
         [Qt] Ensure relative paths in generated .pri files to ensure that
         a source package with pre-generated derived sources can be compiled.
 
diff --git a/WebKit/qt/tests/tests.pri b/WebKit/qt/tests/tests.pri
index b9fedea..187950a 100644
--- a/WebKit/qt/tests/tests.pri
+++ b/WebKit/qt/tests/tests.pri
@@ -3,7 +3,9 @@ CONFIG -= app_bundle
 
 TARGET = tst_$$TARGET
 SOURCES += $$_PRO_FILE_PWD_/$${TARGET}.cpp
-INCLUDEPATH += $$PWD
+INCLUDEPATH += \
+    $$PWD \
+    $$PWD/../Api
 
 exists($$_PRO_FILE_PWD_/$${TARGET}.qrc):RESOURCES += $$_PRO_FILE_PWD_/$${TARGET}.qrc
 

-- 
WebKit Debian packaging