Changeset 48520 in webkit


Ignore:
Timestamp:
Sep 18, 2009 11:57:13 AM (15 years ago)
Author:
eric@webkit.org
Message:

2009-09-18 Fumitoshi Ukai <ukai@chromium.org>

Reviewed by Simon Hausmann.

Update Qt build system for Web Socket.
https://bugs.webkit.org/show_bug.cgi?id=29270

  • WebCore.pro:
  • platform/network/qt/SocketStreamError.h: Added.
  • platform/network/qt/SocketStreamHandle.h: Added.
  • platform/network/qt/SocketStreamHandleSoup.cpp: Added.
Location:
trunk/WebCore
Files:
3 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r48519 r48520  
     12009-09-18  Fumitoshi Ukai  <ukai@chromium.org>
     2
     3        Reviewed by Simon Hausmann.
     4
     5        Update Qt build system for Web Socket.
     6        https://bugs.webkit.org/show_bug.cgi?id=29270
     7
     8        * WebCore.pro:
     9        * platform/network/qt/SocketStreamError.h: Added.
     10        * platform/network/qt/SocketStreamHandle.h: Added.
     11        * platform/network/qt/SocketStreamHandleSoup.cpp: Added.
     12
    1132009-09-18  Eric Carlson  <eric.carlson@apple.com>
    214
  • trunk/WebCore/WebCore.pro

    r48293 r48520  
    170170
    171171# Web Socket support.
    172 # FIXME: Enable once platform code is landed.
    173 # !contains(DEFINES, ENABLE_WEB_SOCKETS=.): DEFINES += ENABLE_WEB_SOCKETS=1
     172!contains(DEFINES, ENABLE_WEB_SOCKETS=.): DEFINES += ENABLE_WEB_SOCKETS=1
    174173
    175174DEFINES += WTF_USE_JAVASCRIPTCORE_BINDINGS=1 WTF_CHANGES=1
     
    31073106}
    31083107
     3108contains(DEFINES, ENABLE_WEB_SOCKETS=1) {
     3109    FEATURE_DEFINES_JAVASCRIPT += ENABLE_WEB_SOCKETS=1
     3110
     3111SOURCES += \
     3112    websockets/WebSocket.cpp \
     3113    websockets/WebSocketChannel.cpp \
     3114    websockets/WebSocketHandshake.cpp \
     3115    platform/network/SocketStreamErrorBase.cpp \
     3116    platform/network/SocketStreamHandleBase.cpp \
     3117    platform/network/qt/SocketStreamHandleSoup.cpp \
     3118    bindings/js/JSWebSocketCustom.cpp \
     3119    bindings/js/JSWebSocketConstructor.cpp
     3120}
     3121
    31093122# GENERATOR 1: IDL compiler
    31103123idl.output = $${GENERATED_SOURCES_DIR}$${QMAKE_DIR_SEP}JS${QMAKE_FILE_BASE}.cpp
Note: See TracChangeset for help on using the changeset viewer.