[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 96e5d0b4bdb8ba84ab9e59f434de742d57a67852
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 30 12:40:06 2009 +0000

    Unreviewed Qt/Symbian build fix.
    
    Don't build network state notifier support when building inside of Qt.
    Otherwise the Qt build depends on an external module that itself depends
    on Qt again.
    
    * WebCore.pro:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52654 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ff6e007..df9e65d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2009-12-30  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Unreviewed Qt/Symbian build fix.
+
+        Don't build network state notifier support when building inside of Qt.
+        Otherwise the Qt build depends on an external module that itself depends
+        on Qt again.
+
+        * WebCore.pro:
+
 2009-12-30  Yury Semikhatsky  <yurys at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index ab3006b..2e9fbf4 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -188,7 +188,7 @@ contains(DEFINES, ENABLE_SINGLE_THREADED=1) {
 }
 
 
-!contains(DEFINES, ENABLE_QT_BEARER=.) {
+!CONFIG(QTDIR_build):!contains(DEFINES, ENABLE_QT_BEARER=.) {
     symbian: {
         exists($${EPOCROOT}epoc32/release/winscw/udeb/QtBearer.lib)| \
         exists($${EPOCROOT}epoc32/release/armv5/lib/QtBearer.lib) {

-- 
WebKit Debian packaging