Last buildfix for Qt after r110595. :)

Reviewed by Benjamin Poulain.

* Api/qwebpage.cpp:
* WebCoreSupport/GeolocationClientQt.h:

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

diff --git a/Source/WebKit/qt/Api/qwebpage.cpp b/Source/WebKit/qt/Api/qwebpage.cpp
index 3cfb9b1..ac50f74 100644 (file)
--- a/Source/WebKit/qt/Api/qwebpage.cpp
+++ b/Source/WebKit/qt/Api/qwebpage.cpp
@@ -64,8 +64,10 @@
 #include "FrameLoaderClientQt.h"
 #include "FrameTree.h"
 #include "FrameView.h"
+#if ENABLE(GEOLOCATION)
 #include "GeolocationClientMock.h"
 #include "GeolocationClientQt.h"
+#endif
 #include "GeolocationPermissionClientQt.h"
 #include "HTMLFormElement.h"
 #include "HTMLFrameOwnerElement.h"

diff --git a/Source/WebKit/qt/ChangeLog b/Source/WebKit/qt/ChangeLog
index 64cb65d..a051ea2 100644 (file)
--- a/Source/WebKit/qt/ChangeLog
+++ b/Source/WebKit/qt/ChangeLog
@@ -1,3 +1,12 @@
+2012-03-14  Csaba Osztrogonác  <ossy@webkit.org>
+
+        Last buildfix for Qt after r110595. :)
+
+        Reviewed by Benjamin Poulain.
+
+        * Api/qwebpage.cpp:
+        * WebCoreSupport/GeolocationClientQt.h:
+
 2012-03-13  Benjamin Poulain  <bpoulain@apple.com>
 
         Attempt to fix QtMinimal bot after r110595

diff --git a/Source/WebKit/qt/WebCoreSupport/GeolocationClientQt.h b/Source/WebKit/qt/WebCoreSupport/GeolocationClientQt.h
index 4da694b..9d07a91 100644 (file)
--- a/Source/WebKit/qt/WebCoreSupport/GeolocationClientQt.h
+++ b/Source/WebKit/qt/WebCoreSupport/GeolocationClientQt.h
@@ -26,8 +26,6 @@
 #ifndef GeolocationClientQt_h
 #define GeolocationClientQt_h
 
-#if ENABLE(GEOLOCATION)
-
 #include "GeolocationClient.h"
 
 #include <QObject>
@@ -78,6 +76,4 @@ private:
 
 } // namespace WebCore
 
-#endif // ENABLE(GEOLOCATION)
-
 #endif // GeolocationClientQt_h