Fix Qt build again
authorstaikos <staikos@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 11 Jan 2007 07:12:00 +0000 (07:12 +0000)
committerstaikos <staikos@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 11 Jan 2007 07:12:00 +0000 (07:12 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@18757 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
JavaScriptCore/ChangeLog
JavaScriptCore/kjs/config.h
WebCore/ChangeLog
WebCore/loader/qt/DocumentLoaderQt.cpp
WebKit.pri
WebKitQt/ChangeLog
WebKitQt/WebCoreSupport/ContextMenuClientQt.cpp
WebKitQt/WebCoreSupport/ContextMenuClientQt.h

index d3b29e5..32f36cf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-11  George Staikos  <staikos@kde.org>
+
+        Fix the Qt build
+
+        * WebKit.pri:
+
 2007-01-03  Lars Knoll <lars@trolltech.com>
 
         Fix the Qt build
index cfe66fc..44c0830 100644 (file)
@@ -1,3 +1,11 @@
+2007-01-11  George Staikos  <staikos@kde.org>
+
+        Reviewed by Maciej
+
+        Appears to be Mac specific right now.
+
+        * kjs/config.h:
+
 2007-01-10  Lars Knoll <lars@trolltech.com>
 
         Reviewed by Zack
index 15fd06a..56ce6d4 100644 (file)
 
 #include <wtf/Platform.h>
 
+#if PLATFORM(MAC)
+#define HAVE_JNI 1
+#endif
+
 #if PLATFORM(DARWIN)
 
 #define HAVE_ERRNO_H 1
@@ -32,7 +36,6 @@
 #define HAVE_SYS_PARAM_H 1
 #define HAVE_SYS_TIME_H 1
 #define HAVE_SYS_TIMEB_H 1
-#define HAVE_JNI 1
 
 #elif PLATFORM(WIN_OS)
 
index ad21f43..948ea61 100644 (file)
@@ -1,3 +1,12 @@
+2007-01-11  George Staikos  <staikos@kde.org>
+
+        Reviewed by Maciej.
+
+        Fix Qt Build.
+
+        * loader/qt/DocumentLoaderQt.cpp:
+        (WebCore::DocumentLoader::getResponseModifiedHeader):
+
 2007-01-10  Kirby White  <KWhiteRight@gmail.com>
 
         Reviewed by Darin.
index b043534..765f600 100644 (file)
@@ -50,7 +50,7 @@ const KURL DocumentLoader::unreachableURL() const
     return url;
 }
 
-bool DocumentLoader::getResponseRefreshAndModifiedHeaders(WebCore::String&, WebCore::String&) const
+bool DocumentLoader::getResponseModifiedHeader(WebCore::String&) const
 {
     notImplemented();
 }
index 379de9e..c8aa797 100644 (file)
@@ -8,6 +8,7 @@ INCLUDEPATH += $$PWD/JavaScriptCore \
                $$PWD/WebCore/platform/graphics \
                $$PWD/WebCore/editing \
                $$PWD/WebCore/page \
+               $$PWD/WebCore/page/qt \
                $$PWD/WebCore/dom \
                $$PWD/WebCore/html \
                $$PWD/WebCore/history \
index d4b2949..3a3cf60 100644 (file)
@@ -1,3 +1,11 @@
+2007-01-11  George Staikos  <staikos@kde.org>
+
+        Fix Qt Build.
+
+        * WebCoreSupport/ContextMenuClientQt.cpp:
+        (WebCore::ContextMenuClientQt::searchWithGoogle):
+        * WebCoreSupport/ContextMenuClientQt.h:
+
 2007-01-06  George Staikos  <staikos@kde.org>
 
         Reviewed by Brady.
index 7306175..c04db97 100644 (file)
@@ -88,5 +88,10 @@ void ContextMenuClientQt::stopSpeaking()
     notImplemented();
 }
 
+void ContextMenuClientQt::searchWithGoogle(const Frame*)
+{
+    notImplemented();
+}
+
 }
 
index e32e49a..e47e2f7 100644 (file)
@@ -49,6 +49,7 @@ namespace WebCore {
         virtual void lookUpInDictionary(Frame*);
         virtual void speak(const String&);
         virtual void stopSpeaking();
+        virtual void searchWithGoogle(const Frame*);
     };
 }