Title: [123453] trunk
Revision
123453
Author
[email protected]
Date
2012-07-24 04:08:39 -0700 (Tue, 24 Jul 2012)

Log Message

[Qt] Enable touch slider when touch events are enabled
https://bugs.webkit.org/show_bug.cgi?id=91013

Reviewed by Kenneth Rohde Christiansen.

TOUCH_SLIDER guards are used in WebCore, so we should really
be setting the corresponding ENABLE define in features.prf.

Source/WebKit2:

* Target.pri:

Tools:

* qmake/mkspecs/features/features.prf:

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (123452 => 123453)


--- trunk/Source/WebKit2/ChangeLog	2012-07-24 10:33:10 UTC (rev 123452)
+++ trunk/Source/WebKit2/ChangeLog	2012-07-24 11:08:39 UTC (rev 123453)
@@ -1,3 +1,15 @@
+2012-07-24  Pierre Rossi  <[email protected]>
+
+        [Qt] Enable touch slider when touch events are enabled
+        https://bugs.webkit.org/show_bug.cgi?id=91013
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        TOUCH_SLIDER guards are used in WebCore, so we should really
+        be setting the corresponding ENABLE define in features.prf.
+
+        * Target.pri:
+
 2012-07-24  Christophe Dumez  <[email protected]>
 
         [EFL][WK2] Fix possible crash in didSendRequestForResource

Modified: trunk/Source/WebKit2/Target.pri (123452 => 123453)


--- trunk/Source/WebKit2/Target.pri	2012-07-24 10:33:10 UTC (rev 123452)
+++ trunk/Source/WebKit2/Target.pri	2012-07-24 11:08:39 UTC (rev 123453)
@@ -851,7 +851,6 @@
 }
 
 contains(DEFINES, ENABLE_TOUCH_EVENTS=1) {
-    DEFINES += ENABLE_TOUCH_SLIDER=1
     HEADERS += \
         Shared/NativeWebTouchEvent.h
     SOURCES += \

Modified: trunk/Tools/ChangeLog (123452 => 123453)


--- trunk/Tools/ChangeLog	2012-07-24 10:33:10 UTC (rev 123452)
+++ trunk/Tools/ChangeLog	2012-07-24 11:08:39 UTC (rev 123453)
@@ -1,3 +1,15 @@
+2012-07-24  Pierre Rossi  <[email protected]>
+
+        [Qt] Enable touch slider when touch events are enabled
+        https://bugs.webkit.org/show_bug.cgi?id=91013
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        TOUCH_SLIDER guards are used in WebCore, so we should really
+        be setting the corresponding ENABLE define in features.prf.
+
+        * qmake/mkspecs/features/features.prf:
+
 2012-07-24  Ryuan Choi  <[email protected]>
 
         [EFL] EWebLauncher should not require config.h in the style check

Modified: trunk/Tools/qmake/mkspecs/features/features.prf (123452 => 123453)


--- trunk/Tools/qmake/mkspecs/features/features.prf	2012-07-24 10:33:10 UTC (rev 123452)
+++ trunk/Tools/qmake/mkspecs/features/features.prf	2012-07-24 11:08:39 UTC (rev 123453)
@@ -244,3 +244,8 @@
 haveQt(4):contains(DEFINES, ENABLE_WEBGL=1):contains(DEFINES, WTF_USE_3D_GRAPHICS=0) {
     error("WebGL requires Qt to be configured with OpenGL. Please reconfigure Qt with OpenGL, or build WebKit without WebGL.")
 }
+
+# Slider Touch is sensible to use when compiling WebKit2
+haveQt(5):contains(DEFINES, ENABLE_TOUCH_EVENTS=1) {
+    DEFINES += ENABLE_TOUCH_SLIDER=1
+}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to