[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[laszlo.1.gombos at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit d82fe1c3c40d6e62eb3f33f512f28ae7bf67cff3
Author: laszlo.1.gombos at nokia.com <laszlo.1.gombos at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 4 21:12:53 2011 +0000

    2011-01-04  Dihan Wickremasuriya  <dihan.wickremasuriya at nokia.com>
    
            Reviewed by Laszlo Gombos.
    
            [Qt] [Symbian] Build system cleanup
    
            After r74811 special handling for the Symbian build is no longer needed.
            This patch reverts r58756.
    
            * WebKit.pri:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74998 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 32f8857..4dad517 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-04  Dihan Wickremasuriya  <dihan.wickremasuriya at nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt] [Symbian] Build system cleanup
+
+        After r74811 special handling for the Symbian build is no longer needed.
+        This patch reverts r58756.
+
+        * WebKit.pri:
+
 2011-01-03  Xan Lopez  <xlopez at igalia.com>
 
         Reviewed by Martin Robinson.
diff --git a/WebKit.pri b/WebKit.pri
index 53e45c8..3104f5b 100644
--- a/WebKit.pri
+++ b/WebKit.pri
@@ -55,11 +55,7 @@ CONFIG(release, debug|release) {
     DEFINES += NDEBUG
 }
 
-symbian {
-    INCLUDEPATH += $$PWD/include/QtWebKit
-} else {
-    INCLUDEPATH += $$OUTPUT_DIR/include/QtWebKit
-}
+INCLUDEPATH += $$OUTPUT_DIR/include/QtWebKit
 
 CONFIG -= warn_on
 *-g++*:QMAKE_CXXFLAGS += -Wall -Wextra -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

-- 
WebKit Debian packaging