Title: [99694] trunk/Source/WebKit2
- Revision
- 99694
- Author
- [email protected]
- Date
- 2011-11-09 05:41:31 -0800 (Wed, 09 Nov 2011)
Log Message
[Qt] Fix geolocation enabled build.
Reviewed by Tor Arne Vestbø.
* Target.pri: Add QT += location to get the right module includes.
* UIProcess/qt/WebGeolocationProviderQt.cpp: Include the moc file with the right name (GeoLocation -> Geolocation)
* UIProcess/qt/WebGeolocationProviderQt.h: Removed the ENABLE(GEOLOCATION) guards, otherwise moc doesn't generate
code, because it can't interpret the ENABLE() macro.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (99693 => 99694)
--- trunk/Source/WebKit2/ChangeLog 2011-11-09 13:31:59 UTC (rev 99693)
+++ trunk/Source/WebKit2/ChangeLog 2011-11-09 13:41:31 UTC (rev 99694)
@@ -1,5 +1,16 @@
2011-11-09 Simon Hausmann <[email protected]>
+ [Qt] Fix geolocation enabled build.
+
+ Reviewed by Tor Arne Vestbø.
+
+ * Target.pri: Add QT += location to get the right module includes.
+ * UIProcess/qt/WebGeolocationProviderQt.cpp: Include the moc file with the right name (GeoLocation -> Geolocation)
+ * UIProcess/qt/WebGeolocationProviderQt.h: Removed the ENABLE(GEOLOCATION) guards, otherwise moc doesn't generate
+ code, because it can't interpret the ENABLE() macro.
+
+2011-11-09 Simon Hausmann <[email protected]>
+
[Qt] Build system cleanup
https://bugs.webkit.org/show_bug.cgi?id=71815
Modified: trunk/Source/WebKit2/Target.pri (99693 => 99694)
--- trunk/Source/WebKit2/Target.pri 2011-11-09 13:31:59 UTC (rev 99693)
+++ trunk/Source/WebKit2/Target.pri 2011-11-09 13:41:31 UTC (rev 99694)
@@ -612,3 +612,5 @@
SOURCES += \
Shared/qt/NativeWebTouchEventQt.cpp
}
+
+contains(DEFINES, ENABLE_GEOLOCATION=1): QT += location
Modified: trunk/Source/WebKit2/UIProcess/qt/WebGeolocationProviderQt.cpp (99693 => 99694)
--- trunk/Source/WebKit2/UIProcess/qt/WebGeolocationProviderQt.cpp 2011-11-09 13:31:59 UTC (rev 99693)
+++ trunk/Source/WebKit2/UIProcess/qt/WebGeolocationProviderQt.cpp 2011-11-09 13:41:31 UTC (rev 99694)
@@ -114,6 +114,6 @@
m_source->stopUpdates();
}
-#include "moc_WebGeoLocationProviderQt.cpp"
+#include "moc_WebGeolocationProviderQt.cpp"
#endif // ENABLE(GEOLOCATION)
Modified: trunk/Source/WebKit2/UIProcess/qt/WebGeolocationProviderQt.h (99693 => 99694)
--- trunk/Source/WebKit2/UIProcess/qt/WebGeolocationProviderQt.h 2011-11-09 13:31:59 UTC (rev 99693)
+++ trunk/Source/WebKit2/UIProcess/qt/WebGeolocationProviderQt.h 2011-11-09 13:41:31 UTC (rev 99694)
@@ -29,8 +29,6 @@
class QGeoPositionInfoSource;
class QGeoPositionInfo;
-#if ENABLE(GEOLOCATION)
-
class WebGeolocationProviderQt : public QObject {
Q_OBJECT
public:
@@ -55,6 +53,4 @@
mutable QGeoPositionInfoSource* m_source;
};
-#endif
-
#endif /* WebGeolocationProviderQt_h */
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
