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

laszlo.1.gombos at nokia.com laszlo.1.gombos at nokia.com
Thu Feb 4 21:31:25 UTC 2010


The following commit has been merged in the webkit-1.1 branch:
commit 5db4fe3a9a73cee5d465500c6b5db49ea32628d5
Author: laszlo.1.gombos at nokia.com <laszlo.1.gombos at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 28 22:08:56 2010 +0000

    2010-01-28  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Unreviewed build fix.
    
            [Qt] Build fix if websockets support is turned off after r53947.
    
            * WebCore.pro:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54019 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e01fbdb..e19c5ea 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-28  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Unreviewed build fix.
+
+        [Qt] Build fix if websockets support is turned off after r53947.
+
+        * WebCore.pro:
+
 2010-01-28  Dimitri Glazkov  <dglazkov at chromium.org>
 
         No review, rolling out r54012.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index e58a58b..0bda407 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -1526,7 +1526,6 @@ HEADERS += \
     platform/network/NetworkStateNotifier.h \
     platform/network/ProtectionSpace.h \
     platform/network/qt/QNetworkReplyHandler.h \
-    platform/network/qt/SocketStreamHandlePrivate.h \
     platform/network/ResourceErrorBase.h \
     platform/network/ResourceHandle.h \
     platform/network/ResourceRequestBase.h \
@@ -2635,6 +2634,9 @@ SOURCES += \
 }
 
 contains(DEFINES, ENABLE_WEB_SOCKETS=1) {
+HEADERS += \
+    platform/network/qt/SocketStreamHandlePrivate.h \
+
 SOURCES += \
     websockets/WebSocket.cpp \
     websockets/WebSocketChannel.cpp \

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list