Repair the Qt build
authorstaikos <staikos@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 21 Jun 2007 04:31:39 +0000 (04:31 +0000)
committerstaikos <staikos@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 21 Jun 2007 04:31:39 +0000 (04:31 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@23688 268f45cc-cd09-0410-ab3c-d52691b4dbfc

JavaScriptCore/ChangeLog
JavaScriptCore/JavaScriptCore.pri
JavaScriptCore/kjs/testkjs.pro
WebCore/ChangeLog
WebCore/ForwardingHeaders/JavaScriptCore/APICast.h [new file with mode: 0644]
WebCore/ForwardingHeaders/JavaScriptCore/JSLock.h [new file with mode: 0644]
WebCore/WebCore.pro
WebCore/page/InspectorController.h
WebKitQt/ChangeLog
WebKitQt/WebCoreSupport/ContextMenuClientQt.cpp
WebKitQt/WebCoreSupport/ContextMenuClientQt.h

index a1333a5f84bf9eec4fd9a27e386f1e218544c6a5..59cc3d456216f1464813719721a38c2e80b55326 100644 (file)
@@ -1,3 +1,9 @@
+2007-06-15  George Staikos  <staikos@kde.org>
+
+        Fixing Qt build.
+
+        * JavaScriptCore.pri:
+
 2007-06-20  Mark Rowe  <mrowe@apple.com>
 
         Reviewed by Mitz.
index 3df69312f87d693f3a4d0daf02bba09e2a160805..a5407d20a329098e1b97db543734c40abd32c0f3 100644 (file)
@@ -39,6 +39,7 @@ SOURCES += \
     bindings/c/c_instance.cpp \
     bindings/c/c_runtime.cpp \
     bindings/c/c_utility.cpp \
+    API/JSValueRef.cpp \
     kjs/DateMath.cpp \
     kjs/JSWrapperObject.cpp \
     kjs/PropertyNameArray.cpp \
index a2501e88ce447a9e2ba533095ff45d9aa37a0f9c..9fd5b00bbf46588a6ddc3526a165100b1362e9d4 100644 (file)
@@ -6,7 +6,7 @@ QT -= gui
 DEFINES -= KJS_IDENTIFIER_HIDE_GLOBALS 
 INCLUDEPATH += $$PWD/.. $$PWD $$PWD/../bindings $$PWD/../bindings/c $$PWD/../wtf
 qt-port:DEFINES += BUILDING_QT__
-qt-port:LIBS += -L$$OUTPUT_DIR/lib -lQtWebKit
+#qt-port:LIBS += -L$$OUTPUT_DIR/lib -lQtWebKit
 gdk-port {
     QMAKE_CXXFLAGS += $$system(icu-config --cppflags)
     LIBS += $$system(icu-config --ldflags)
@@ -17,3 +17,6 @@ isEmpty(OUTPUT_DIR):OUTPUT_DIR=$$PWD/../..
 include($$OUTPUT_DIR/config.pri)
 
 include($$PWD/../JavaScriptCore.pri)
+
+# Hack!  Fix this.
+SOURCES -= API/JSValueRef.cpp
index 5e6ceaffca96da55c58911fdca0ae2f76492336d..16d9c2fa13a75bdbde4a52eda7b48b260609e483 100644 (file)
@@ -1,3 +1,11 @@
+2007-06-15  George Staikos  <staikos@kde.org>
+
+        Fixing Qt build.
+
+        * ForwardingHeaders/JavaScriptCore/APICast.h: Added.
+        * WebCore.pro:
+        * page/InspectorController.h:
+
 2007-06-20  Adam Roben  <aroben@apple.com>
 
         More speculative Qt/Gdk build fixes.
diff --git a/WebCore/ForwardingHeaders/JavaScriptCore/APICast.h b/WebCore/ForwardingHeaders/JavaScriptCore/APICast.h
new file mode 100644 (file)
index 0000000..06b566b
--- /dev/null
@@ -0,0 +1 @@
+#include <JavaScriptCore/API/APICast.h>
diff --git a/WebCore/ForwardingHeaders/JavaScriptCore/JSLock.h b/WebCore/ForwardingHeaders/JavaScriptCore/JSLock.h
new file mode 100644 (file)
index 0000000..8519612
--- /dev/null
@@ -0,0 +1 @@
+#include <kjs/JSLock.h>
index 7a1bcb6ed12ddd9635b71152115d565a62b11a69..ba7d1eec51e0d1dd1a07c1074efef348f6960efa 100644 (file)
@@ -81,6 +81,7 @@ gdk-port:INCLUDEPATH += \
 
 INCLUDEPATH +=  $$PWD \
                 $$PWD/ForwardingHeaders \
+                $$PWD/.. \
                 $$PWD/../JavaScriptCore/kjs \
                 $$PWD/../JavaScriptCore/bindings \
                 $$PWD/platform \
index b0f968f537ec569399fba40216c6af3effd66f6c..6ee68cddcad2fdec926e8990545a1730e38b0cfc 100644 (file)
 #define InspectorController_h
 
 #include "Chrome.h"
+#if PLATFORM(QT)
+#include <JavaScriptCore/JSContextRef.h>
+#include <JavaScriptCore/JSStringRef.h>
+#else
 #include <JavaScriptCore/JavaScriptCore.h>
+#endif
 #include <wtf/HashMap.h>
 #include <wtf/RefPtr.h>
 #include <wtf/Vector.h>
index a60f9c484d50125485170a2086fe3924812278de..32342ddd80b86b3fc89dd2e35fb649c0469ab557 100644 (file)
@@ -1,3 +1,11 @@
+2007-06-15  George Staikos  <staikos@kde.org>
+
+        Fixing the Qt build.
+
+        * WebCoreSupport/ContextMenuClientQt.cpp:
+        (WebCore::ContextMenuClientQt::shouldIncludeInspectElementItem):
+        * WebCoreSupport/ContextMenuClientQt.h:
+
 2007-06-20  Adam Roben  <aroben@apple.com>
 
         More speculative Qt build fixes.
index 144c57c2b6d34b2d93b3ca19a525827c65760112..ddf47e7b08f7e1dc2448145a1efba09495a146fa 100644 (file)
@@ -76,5 +76,11 @@ void ContextMenuClientQt::searchWithGoogle(const Frame*)
     notImplemented();
 }
 
+bool ContextMenuClientQt::shouldIncludeInspectElementItem()
+{
+    notImplemented();
+    return false;
+}
+
 }
 
index e668c6892282b1fe73c506a3158d5ee8f8e61b18..d7c35d166501b281585c4581be5a047109507e5b 100644 (file)
@@ -46,6 +46,8 @@ namespace WebCore {
         virtual void speak(const String&);
         virtual void stopSpeaking();
         virtual void searchWithGoogle(const Frame*);
+
+        virtual bool shouldIncludeInspectElementItem();
     };
 }