diff options
-rw-r--r-- | Tools/qmake/mkspecs/features/features.prf | 6 | ||||
-rw-r--r-- | Tools/qmake/mkspecs/features/features.pri | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Tools/qmake/mkspecs/features/features.prf b/Tools/qmake/mkspecs/features/features.prf index b7fb4c43b..21286be2e 100644 --- a/Tools/qmake/mkspecs/features/features.prf +++ b/Tools/qmake/mkspecs/features/features.prf @@ -136,9 +136,6 @@ defineTest(detectFeatures) { have?(glx):have?(xcomposite):have?(xrender): WEBKIT_CONFIG += use_graphics_surface use_glx } - # Slider Touch is sensible to use when compiling WebKit2 - enable?(touch_events): WEBKIT_CONFIG += touch_slider - # IndexedDB requires leveldb enable?(indexed_database): WEBKIT_CONFIG += use_leveldb @@ -185,5 +182,8 @@ defineTest(sanitizeFeatures) { # Accelerated 2D canvas uses 3D graphics support. !use?(3d_graphics): WEBKIT_CONFIG -= accelerated_2d_canvas + # Touch slider requires touch events + !enable?(touch_events): WEBKIT_CONFIG -= touch_slider + export(WEBKIT_CONFIG) } diff --git a/Tools/qmake/mkspecs/features/features.pri b/Tools/qmake/mkspecs/features/features.pri index 1978aa081..ba18b354d 100644 --- a/Tools/qmake/mkspecs/features/features.pri +++ b/Tools/qmake/mkspecs/features/features.pri @@ -114,6 +114,7 @@ FEATURE_DEFAULTS = \ ENABLE_TOUCH_ADJUSTMENT=1 \ ENABLE_TOUCH_EVENTS=1 \ ENABLE_TOUCH_ICON_LOADING=0 \ + ENABLE_TOUCH_SLIDER=1 \ ENABLE_USER_TIMING=0 \ ENABLE_VIBRATION=0 \ ENABLE_VIDEO=0 \ |