Reviewed, tweaked and landed by ap

        http://bugzilla.opendarwin.org/show_bug.cgi?id=10467
        WebKit should have Qt platform support (Part II)

        * CMakeLists.txt: Adjust to Anders' build fixes.
        * wtf/Platform.h: Fix define for the Qt platform (we don't use/need Cairo.)

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16009 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/CMakeLists.txt b/JavaScriptCore/CMakeLists.txt
index 11cea4a33566803550586758b24fa79f1026d277..d0573ad32533607ce0501c5cedaf31fd05e97a13 100644 (file)
--- a/JavaScriptCore/CMakeLists.txt
+++ b/JavaScriptCore/CMakeLists.txt
@@ -11,6 +11,8 @@ check_library_exists(pthread pthread_getattr_np "" HAVE_PTHREAD_GETATTR_NP)
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/pcre
+    ${CMAKE_CURRENT_SOURCE_DIR}/bindings
+    ${CMAKE_CURRENT_SOURCE_DIR}/bindings/c
     ${CMAKE_CURRENT_BINARY_DIR}/kjs
     ${CMAKE_CURRENT_SOURCE_DIR}/kjs
 
@@ -63,6 +65,17 @@ kde4_add_library(wtf-unity SHARED
 set(kjs-unity_LIB_SRCS
     ${kjs-unity_LIB_SRCS}
     wtf/unicode/qt4/UnicodeQt4.cpp
+    bindings/NP_jsobject.cpp
+    bindings/npruntime.cpp
+    bindings/runtime_array.cpp
+    bindings/runtime.cpp
+    bindings/runtime_method.cpp
+    bindings/runtime_object.cpp
+    bindings/runtime_root.cpp
+    bindings/c/c_class.cpp
+    bindings/c/c_instance.cpp
+    bindings/c/c_runtime.cpp
+    bindings/c/c_utility.cpp
     kjs/JSWrapperObject.cpp
        kjs/PropertyNameArray.cpp
        kjs/array_object.cpp

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 658e1db8a40f7d732b6017d5827c28fdd82a6971..db23bc8a556e91150cc661ec8fba02a8a816c5e8 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2006-08-24  Nikolas Zimmermann  <zimmermann@kde.org>
+
+        Reviewed, tweaked and landed by ap
+
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=10467
+        WebKit should have Qt platform support (Part II)
+
+        * CMakeLists.txt: Adjust to Anders' build fixes.
+        * wtf/Platform.h: Fix define for the Qt platform (we don't use/need Cairo.)
+
 2006-08-23  David Hyatt  <hyatt@apple.com>
 
         Fix Platform.h to include #defines for graphics features.

diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h
index 7fcca68311b45518c617de0d8e928aabc93942c2..e3e0859066b6edb7d26e2feab919a6c96252d369 100644 (file)
--- a/JavaScriptCore/wtf/Platform.h
+++ b/JavaScriptCore/wtf/Platform.h
@@ -84,7 +84,7 @@
 /* PLATFORM(CAIRO) */
 #if PLATFORM(MAC)
 #define KXMLCORE_PLATFORM_CG 1
-#else
+#elif !PLATFORM(QT)
 #define KXMLCORE_PLATFORM_CAIRO 1
 #endif