Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	.qmake.conf

Change-Id: Ic399cf8fef1f26f22338a67393066d69cd969579

4 files changed, 10 insertions, 4 deletions

diff --git a/Tools/qmake/mkspecs/features/default_post.prf b/Tools/qmake/mkspecs/features/default_post.prf
index 39bb3f7ae..19313d087 100644
--- a/Tools/qmake/mkspecs/features/default_post.prf
+++ b/Tools/qmake/mkspecs/features/default_post.prf
@@ -263,7 +263,8 @@ QMAKE_EXTRA_TARGETS += incremental
 
 contains(TEMPLATE, lib) {
     # Triggers the right export macros for WebKit internals
-    DEFINES += BUILDING_$${TARGET}
+    # (don't set for Qt modules; qt_module.prf does it)
+    !creating_module: DEFINES += BUILDING_$${TARGET}
 
     # Triggers the right export macro for the QtWebKit API (see qwebkitglobal.h)
     !contains(QT, webkit)|equals(MODULE, webkitwidgets): DEFINES += BUILDING_WEBKIT
diff --git a/Tools/qmake/mkspecs/features/default_pre.prf b/Tools/qmake/mkspecs/features/default_pre.prf
index dbad90d5f..3e6677c92 100644
--- a/Tools/qmake/mkspecs/features/default_pre.prf
+++ b/Tools/qmake/mkspecs/features/default_pre.prf
@@ -102,6 +102,7 @@ gcc:isEqual(QT_ARCH, "arm"): CONFIG -= use_gold_linker
 
 # Pick up Qt's defaults for debug/release/debug_and_release
 if(win32|mac):!macx-xcode {
+    contains(QT_CONFIG, simulator_and_device): CONFIG += iphonesimulator_and_iphoneos
     contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release
     contains(QT_CONFIG, build_all): CONFIG += build_all
 }
diff --git a/Tools/qmake/mkspecs/features/features.prf b/Tools/qmake/mkspecs/features/features.prf
index bb3432bd2..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
 
@@ -173,6 +170,9 @@ defineTest(sanitizeFeatures) {
     # GStreamer uses Glib
     use?(gstreamer): WEBKIT_CONFIG += use_glib
 
+    # LevelDB is not needed without indexed_database
+    !enable?(indexed_database): WEBKIT_CONFIG -= use_leveldb
+
     # VideoTrack requires video
     !enable?(video): WEBKIT_CONFIG -= video_track
 
@@ -182,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 \