[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[jocelyn.turcotte at nokia.com]

The following commit has been merged in the webkit-1.1 branch:
commit 6cd123f319e76e66a974283afcbcbcdb4e388041
Author: jocelyn.turcotte at nokia.com <jocelyn.turcotte at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 26 11:06:48 2010 +0000

    Unreviewed build fix.
    
    [Qt] Fix Windows build when sqlite is not available.
    
    * WebCore.pri:
    * WebCore.pro:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53848 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index cfe041a..fe17611 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-26  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
+
+        Unreviewed build fix.
+
+        [Qt] Fix Windows build when sqlite is not available.
+
+        * WebCore.pri:
+        * WebCore.pro:
+
 2010-01-26  Holger Hans Peter Freyther  <zecke at selfish.org>
 
         Reviewed by Simon Hausmann.
diff --git a/WebCore/WebCore.pri b/WebCore/WebCore.pri
index 32c97c4..07b1532 100644
--- a/WebCore/WebCore.pri
+++ b/WebCore/WebCore.pri
@@ -21,7 +21,7 @@ contains(DEFINES, ENABLE_SINGLE_THREADED=1) {
 }
 
 # turn off SQLITE support if we do not have sqlite3 available
-!CONFIG(QTDIR_build):win32-*:!exists( $${SQLITE3SRCDIR}/sqlite3.c ): DEFINES += ENABLE_SQLITE=0 ENABLE_DATABASE=0 ENABLE_ICONDATABASE=0 ENABLE_OFFLINE_WEB_APPLICATIONS=0 ENABLE_DOM_STORAGE=0
+!CONFIG(QTDIR_build):win32-*:!exists( $${SQLITE3SRCDIR}/sqlite3.c ): DEFINES += ENABLE_SQLITE=0 ENABLE_DATABASE=0 ENABLE_WORKERS=0 ENABLE_SHARED_WORKERS=0 ENABLE_ICONDATABASE=0 ENABLE_OFFLINE_WEB_APPLICATIONS=0 ENABLE_DOM_STORAGE=0
 
 !contains(DEFINES, ENABLE_JAVASCRIPT_DEBUGGER=.): DEFINES += ENABLE_JAVASCRIPT_DEBUGGER=1
 !contains(DEFINES, ENABLE_DATABASE=.): DEFINES += ENABLE_DATABASE=1
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 2a4a512..3304be0 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -2639,6 +2639,7 @@ SOURCES += \
     websockets/WebSocket.cpp \
     websockets/WebSocketChannel.cpp \
     websockets/WebSocketHandshake.cpp \
+    websockets/ThreadableWebSocketChannel.cpp \
     platform/network/SocketStreamErrorBase.cpp \
     platform/network/SocketStreamHandleBase.cpp \
     platform/network/qt/SocketStreamHandleQt.cpp \
@@ -2647,7 +2648,6 @@ SOURCES += \
 
 contains(DEFINES, ENABLE_WORKERS=1) {
 SOURCES += \
-    websockets/ThreadableWebSocketChannel.cpp \
     websockets/WorkerThreadableWebSocketChannel.cpp
 }
 }

-- 
WebKit Debian packaging