Fix the Qt build.
authorhausmann@webkit.org <hausmann@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 7 Mar 2008 13:09:09 +0000 (13:09 +0000)
committerhausmann@webkit.org <hausmann@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 7 Mar 2008 13:09:09 +0000 (13:09 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@30870 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/WebCore.pro
WebKit/qt/Api/qwebframe.cpp
WebKit/qt/ChangeLog

index 063318b1a677f3f2a9a78671ba3fdab1e966cf03..c3f810a5b698375c07fc1c3f9960b8d0e0c2f07c 100644 (file)
@@ -1,3 +1,9 @@
+2008-03-07  Simon Hausmann  <hausmann@webkit.org>
+
+        Fix the Qt build.
+
+        * WebCore.pro:
+
 2008-03-06  Sam Weinig  <sam@webkit.org> with a little help from Oliver Hunt  <oliver@apple.com>
 
         Reviewed by Mitz.
index 45026f96a05746e082661d2bca8bad36af25fe32..37c27290689064c5a8a9a32b2d2581a0c4e68e54 100644 (file)
@@ -30,7 +30,7 @@ INCLUDEPATH += $$GENERATED_SOURCES_DIR
 
 DEPENDPATH += css dom loader editing history html \
     loader page platform platform/graphics platform/network platform/text plugins rendering xml \
-    bindings/js
+    bindings/js bridge bridge/c bridge/qt
 
 include($$OUTPUT_DIR/config.pri)
 
@@ -127,7 +127,8 @@ INCLUDEPATH += \
                 $$PWD/loader/qt \
                 $$PWD/page/qt \
                 $$PWD/../WebKit/qt/WebCoreSupport \
-                $$PWD/../WebKit/qt/Api
+                $$PWD/../WebKit/qt/Api \
+                $$PWD/bridge/qt
 
 DEPENDPATH += editing/qt history/qt loader/qt page/qt \
     platform/graphics/qt ../WebKit/qt/Api ../WebKit/qt/WebCoreSupport
@@ -210,7 +211,10 @@ INCLUDEPATH +=  $$PWD \
                 $$PWD/bindings/js \
                 $$PWD/svg \
                 $$PWD/platform/image-decoders \
-                $$PWD/plugins
+                $$PWD/plugins \
+                $$PWD/bridge \
+                $$PWD/bridge/c \
+                $$PWD/bridge/qt
 
 QT += network
 lessThan(QT_MINOR_VERSION, 4): QT += xml
@@ -442,6 +446,17 @@ SOURCES += \
     bindings/js/kjs_proxy.cpp \
     bindings/js/PausedTimeouts.cpp \
     bindings/js/ScheduledAction.cpp \
+    bridge/NP_jsobject.cpp \
+    bridge/npruntime.cpp \
+    bridge/runtime_array.cpp \
+    bridge/runtime.cpp \
+    bridge/runtime_method.cpp \
+    bridge/runtime_object.cpp \
+    bridge/runtime_root.cpp \
+    bridge/c/c_class.cpp \
+    bridge/c/c_instance.cpp \
+    bridge/c/c_runtime.cpp \
+    bridge/c/c_utility.cpp \
     css/CSSBorderImageValue.cpp \
     css/CSSCharsetRule.cpp \
     css/CSSComputedStyleDeclaration.cpp \
@@ -899,6 +914,9 @@ qt-port {
     $$PWD/platform/network/qt/QNetworkReplyHandler.h
 
     SOURCES += \
+    bridge/qt/qt_class.cpp \
+    bridge/qt/qt_instance.cpp \
+    bridge/qt/qt_runtime.cpp \
     page/qt/DragControllerQt.cpp \
     page/qt/EventHandlerQt.cpp \
     page/qt/FrameQt.cpp \
index d183370581174f737546f08723f824b3846e89db..2c7bf34e3a4e4b356084f9b5bff5c61c3180d228 100644 (file)
@@ -52,8 +52,8 @@
 #include "GraphicsContext.h"
 #include "HitTestResult.h"
 
-#include "bindings/runtime.h"
-#include "bindings/runtime_root.h"
+#include "runtime.h"
+#include "runtime_root.h"
 #include "JSDOMWindow.h"
 #include "kjs_proxy.h"
 #include "kjs_binding.h"
index 57be2da2b84cbb020ec2cb659581ba9f5db96e52..f777741eed0df4da38350c42d7384d4dc3c620c4 100644 (file)
@@ -1,3 +1,9 @@
+2008-03-07  Simon Hausmann  <hausmann@webkit.org>
+
+        Fix the Qt build.
+
+        * Api/qwebframe.cpp:
+
 2008-03-04  Sam Weinig  <sam@webkit.org>
 
         Reviewed by Mark Rowe.