Changeset 17853 in webkit for trunk/JavaScriptCore/pcre

Timestamp:

Nov 19, 2006, 10:39:14 AM (19 years ago)

Author:

staikos

Message:

top level:

Reviewed by Zack.

​http://bugs.webkit.org/show_bug.cgi?id=11649

• CMakeLists.txt: Fix Qt-only build without KDE cmake files

JavaScriptCore:

Reviewed by Zack.

​http://bugs.webkit.org/show_bug.cgi?id=11649
Fix CMake Qt-only build without KDE CMake files

• CMakeLists.txt:
• pcre/CMakeLists.txt:

WebCore:

Reviewed by Zack.

​http://bugs.webkit.org/show_bug.cgi?id=11649
Fix CMake files for Qt-only build without KDE cmake files.
Fix Qt/KDE build for the SVG support.
Fix Qt-only build in the resource handler.

• CMakeLists.txt:
• platform/graphics/svg/qt/SVGResourceFilterQt.cpp: Added. (WebCore::SVGResourceFilter::SVGResourceFilter): (WebCore::SVGResourceFilter::~SVGResourceFilter): (WebCore::SVGResourceFilter::prepareFilter): (WebCore::SVGResourceFilter::applyFilter):
• platform/network/qt/ResourceHandleManager.cpp: (WebCore::ResourceHandleManager::cancel): (WebCore::ResourceHandleManager::slotData): (WebCore::ResourceHandleManager::slotMimetype): (WebCore::ResourceHandleManager::slotResult): (WebCore::ResourceHandleManager::deliverJobData):
• platform/network/qt/ResourceHandleManager.h:
• platform/network/qt/ResourceHandleQt.cpp:
• platform/qt/CursorQt.cpp: (WebCore::noDropCursor): (WebCore::progressCursor): (WebCore::aliasCursor):

WebKitQt:

Reviewed by Zack.

​http://bugs.webkit.org/show_bug.cgi?id=11649
Fix Qt-only build

• QtLauncher/CMakeLists.txt:

File:

• trunk/JavaScriptCore/pcre/CMakeLists.txt (modified) (2 diffs)

trunk/JavaScriptCore/pcre/CMakeLists.txt

@@ -2 +2 @@
 project( pcre-unity )
 
-include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../wtf )
+include_directories( 
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/..
+    ${CMAKE_CURRENT_SOURCE_DIR}/../wtf
+    )
 #compile dftables.c -> dftables
 #run dftables to generate chartables.c
@@ -37 +41 @@
    )
 
-kde4_add_library(pcre-unity STATIC ${pcre-unity_LIB_SRCS})
+IF (WEBKIT_USE_KDE_SUPPORT)
+    kde4_add_library(pcre-unity STATIC ${pcre-unity_LIB_SRCS})
+ELSE (WEBKIT_USE_KDE_SUPPORT)
+    add_library(pcre-unity STATIC ${pcre-unity_LIB_SRCS})
+ENDIF (WEBKIT_USE_KDE_SUPPORT)