Title: [126299] trunk/Tools
Revision
126299
Author
[email protected]
Date
2012-08-22 07:00:57 -0700 (Wed, 22 Aug 2012)

Log Message

Unreviewed buildfix for Qt-minimal after r126291

Disable smooth scrolling when request-animation-frame has been disabled either
explicitly or as part of --minimal.

* qmake/mkspecs/features/features.prf:

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (126298 => 126299)


--- trunk/Tools/ChangeLog	2012-08-22 13:34:13 UTC (rev 126298)
+++ trunk/Tools/ChangeLog	2012-08-22 14:00:57 UTC (rev 126299)
@@ -1,5 +1,14 @@
 2012-08-22  Allan Sandfeld Jensen  <[email protected]>
 
+        Unreviewed buildfix for Qt-minimal after r126291
+
+        Disable smooth scrolling when request-animation-frame has been disabled either
+        explicitly or as part of --minimal.
+
+        * qmake/mkspecs/features/features.prf:
+
+2012-08-22  Allan Sandfeld Jensen  <[email protected]>
+
         [Qt] Optionally support smooth-scrolling on all platforms
         https://bugs.webkit.org/show_bug.cgi?id=74926
 

Modified: trunk/Tools/qmake/mkspecs/features/features.prf (126298 => 126299)


--- trunk/Tools/qmake/mkspecs/features/features.prf	2012-08-22 13:34:13 UTC (rev 126298)
+++ trunk/Tools/qmake/mkspecs/features/features.prf	2012-08-22 14:00:57 UTC (rev 126299)
@@ -214,6 +214,9 @@
     DEFINES += ENABLE_INSPECTOR_SERVER=0
 }
 
+# Disable animated smooth scrolling if request-animation-frame is disabled
+contains(DEFINES, ENABLE_REQUEST_ANIMATION_FRAME=0): DEFINES += ENABLE_SMOOTH_SCROLLING=0
+
 # Remove conflicting defines. The preprocessor would take care of this
 # anyways, but doing it here makes for nicer command lines when building.
 for(define, DEFINES) {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to