Title: [156534] trunk/Tools
- Revision
- 156534
- Author
- [email protected]
- Date
- 2013-09-27 04:57:52 -0700 (Fri, 27 Sep 2013)
Log Message
[Qt] Mock implementations of positioning and orientation not used
https://bugs.webkit.org/show_bug.cgi?id=121956
Reviewed by Csaba Osztrogonác.
Move production_build checks to sanitizeFeatures where its value is actually known.
* qmake/mkspecs/features/features.prf:
* qmake/mkspecs/features/features.pri:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (156533 => 156534)
--- trunk/Tools/ChangeLog 2013-09-27 10:40:37 UTC (rev 156533)
+++ trunk/Tools/ChangeLog 2013-09-27 11:57:52 UTC (rev 156534)
@@ -1,3 +1,15 @@
+2013-09-27 Allan Sandfeld Jensen <[email protected]>
+
+ [Qt] Mock implementations of positioning and orientation not used
+ https://bugs.webkit.org/show_bug.cgi?id=121956
+
+ Reviewed by Csaba Osztrogonác.
+
+ Move production_build checks to sanitizeFeatures where its value is actually known.
+
+ * qmake/mkspecs/features/features.prf:
+ * qmake/mkspecs/features/features.pri:
+
2013-09-27 Mario Sanchez Prada <[email protected]>
[ATK] Normalize checks in entry points for DRT and WKTR
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (156533 => 156534)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2013-09-27 10:40:37 UTC (rev 156533)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2013-09-27 11:57:52 UTC (rev 156534)
@@ -97,14 +97,6 @@
# Enable CSS shaders when CSS filters and WebGL are enabled
enable?(css_filters):enable?(webgl): WEBKIT_CONFIG += css_shaders
- # Geolocation support if QtPositioning exists or if we're doing a developer build (Mock implementation exists
- # and used for layout tests)
- have?(qtpositioning)|!production_build: WEBKIT_CONFIG += geolocation
-
- # Orientation support if QtSensors exists or if we're doing a developer build (Mock implementation exists
- # and used for layout tests)
- have?(qtsensors)|!production_build: WEBKIT_CONFIG += orientation_events device_orientation
-
# HTML5 Media Support for non-Mac builds
!mac {
!contains(QT_CONFIG, no-pkg-config) {
@@ -155,6 +147,12 @@
}
defineTest(santizeFeatures) {
+ # If we are doing a production_build we should only enable Geolocation support if QtPositioning exists. In developer builds we can use Mock implementations.
+ production_build:!have?(qtpositioning): WEBKIT_CONFIG -= geolocation
+
+ # If we are doing a production_build we should only enable Orientation support if QtSensors exists. In developer builds we can use Mock implementations.
+ production_build:!have?(qtsensors): WEBKIT_CONFIG -= orientation_events device_orientation
+
# Disable SVG fonts if SVG is disabled
!enable?(svg): WEBKIT_CONFIG -= svg_fonts
Modified: trunk/Tools/qmake/mkspecs/features/features.pri (156533 => 156534)
--- trunk/Tools/qmake/mkspecs/features/features.pri 2013-09-27 10:40:37 UTC (rev 156533)
+++ trunk/Tools/qmake/mkspecs/features/features.pri 2013-09-27 11:57:52 UTC (rev 156534)
@@ -45,7 +45,7 @@
ENABLE_DATALIST_ELEMENT=1 \
ENABLE_DATA_TRANSFER_ITEMS=0 \
ENABLE_DETAILS_ELEMENT=1 \
- ENABLE_DEVICE_ORIENTATION=0 \
+ ENABLE_DEVICE_ORIENTATION=1 \
ENABLE_DIRECTORY_UPLOAD=0 \
ENABLE_DOM4_EVENTS_CONSTRUCTOR=0 \
ENABLE_DOWNLOAD_ATTRIBUTE=0 \
@@ -57,7 +57,7 @@
ENABLE_FTPDIR=1 \
ENABLE_FULLSCREEN_API=1 \
ENABLE_GAMEPAD=0 \
- ENABLE_GEOLOCATION=0 \
+ ENABLE_GEOLOCATION=1 \
ENABLE_GESTURE_EVENTS=1 \
ENABLE_HIGH_DPI_CANVAS=0 \
ENABLE_ICONDATABASE=1 \
@@ -94,7 +94,7 @@
ENABLE_NOSNIFF=0 \
ENABLE_NOTIFICATIONS=1 \
ENABLE_OPENCL=0 \
- ENABLE_ORIENTATION_EVENTS=0 \
+ ENABLE_ORIENTATION_EVENTS=1 \
ENABLE_PAGE_VISIBILITY_API=1 \
ENABLE_PERFORMANCE_TIMELINE=0 \
ENABLE_PROGRESS_ELEMENT=1 \
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
