Fix Qt build again

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

diff --git a/ChangeLog b/ChangeLog
index d3b29e5f44c4625db6df5edbb1397266f119e7a9..32f36cf1584dbb6abd1e1b8fa107fc9d23dc2b43 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

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index cfe66fc6f158e02024544b7cee972b69fcf963e8..44c0830edad842e5e146614df34d6d58b6237292 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -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

diff --git a/JavaScriptCore/kjs/config.h b/JavaScriptCore/kjs/config.h
index 15fd06a0fe3c613fbd0516bf78e03e5f7b619b5a..56ce6d45a5595e62f3cbc7180e2f929e376bcdcd 100644 (file)
--- a/JavaScriptCore/kjs/config.h
+++ b/JavaScriptCore/kjs/config.h
@@ -21,6 +21,10 @@
 
 #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)
 

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ad21f43bf94e900a6913bc70db1ccdcdb6048619..948ea61b53e329b99797cdc73517f66ddf45ac1e 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -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.

diff --git a/WebCore/loader/qt/DocumentLoaderQt.cpp b/WebCore/loader/qt/DocumentLoaderQt.cpp
index b0435349920d6d4a26aff4dba2e740ca6ebcf1bf..765f60046d83b797f4944337c1113eccf958a814 100644 (file)
--- a/WebCore/loader/qt/DocumentLoaderQt.cpp
+++ b/WebCore/loader/qt/DocumentLoaderQt.cpp
@@ -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();
 }

diff --git a/WebKit.pri b/WebKit.pri
index 379de9eacad9e286ac21ae61c4235cd5cf1aa8fa..c8aa797ca87b6974a64c281c3a867f72110ed847 100644 (file)
--- a/WebKit.pri
+++ b/WebKit.pri
@@ -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 \

diff --git a/WebKitQt/ChangeLog b/WebKitQt/ChangeLog
index d4b29491eeaf4b9093fb036c2d8766f2fc906618..3a3cf605bd3a737bc49f8683ebd816e58059846c 100644 (file)
--- a/WebKitQt/ChangeLog
+++ b/WebKitQt/ChangeLog
@@ -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.

diff --git a/WebKitQt/WebCoreSupport/ContextMenuClientQt.cpp b/WebKitQt/WebCoreSupport/ContextMenuClientQt.cpp
index 730617527b528962437f4551040d030525373b38..c04db972bb47192c85448133c92b5120e3c0248a 100644 (file)
--- a/WebKitQt/WebCoreSupport/ContextMenuClientQt.cpp
+++ b/WebKitQt/WebCoreSupport/ContextMenuClientQt.cpp
@@ -88,5 +88,10 @@ void ContextMenuClientQt::stopSpeaking()
     notImplemented();
 }
 
+void ContextMenuClientQt::searchWithGoogle(const Frame*)
+{
+    notImplemented();
+}
+
 }
 

diff --git a/WebKitQt/WebCoreSupport/ContextMenuClientQt.h b/WebKitQt/WebCoreSupport/ContextMenuClientQt.h
index e32e49aa75127575bf15f6c57a81adde79dd3573..e47e2f782ebb759c32c31f2a1114c929ce39d090 100644 (file)
--- a/WebKitQt/WebCoreSupport/ContextMenuClientQt.h
+++ b/WebKitQt/WebCoreSupport/ContextMenuClientQt.h
@@ -49,6 +49,7 @@ namespace WebCore {
         virtual void lookUpInDictionary(Frame*);
         virtual void speak(const String&);
         virtual void stopSpeaking();
+        virtual void searchWithGoogle(const Frame*);
     };
 }