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

Also blacklist tst_QWebEnginePage::comboBoxPopupPositionAfterChildMove()
and comboBoxPopupPositionAfterMove().

Conflicts:
	.qmake.conf
	src/3rdparty
	src/core/render_widget_host_view_qt.cpp
	src/core/resources/resources.gyp
	src/webengine/doc/src/qtwebengine-platform-notes.qdoc
	src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
	src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h
	tests/auto/widgets/qwebenginepage/BLACKLIST
	tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
	tools/qmake/mkspecs/features/functions.prf

Task-number: QTBUG-55158
Change-Id: I1d73ac9b3ca5293ad3c7e3a56f4c395da930e6f4

4 files changed, 33 insertions, 19 deletions

diff --git a/tools/buildscripts/gyp_qtwebengine b/tools/buildscripts/gyp_qtwebengine
index d896364ed..26f8d0f06 100755
--- a/tools/buildscripts/gyp_qtwebengine
+++ b/tools/buildscripts/gyp_qtwebengine
@@ -108,7 +108,8 @@ if __name__ == '__main__':
       break
 
   if not gyp_file_specified:
-      args.append(os.path.join(root_dir, 'src/core/core.gyp'))
+      args.append(os.path.join(root_dir, 'src/core/resources/resources.gyp'))
+      args.append(os.path.join(output_dir, 'core_generated.gyp'))
 
   args.extend(['-I' + i for i in additional_include_files(args)])
 
@@ -154,7 +155,7 @@ if __name__ == '__main__':
 
   # Tweak the output location and format (hardcode ninja for now if not set)
   args.extend(['--generator-output', '.'])
-  args.extend(['-Goutput_dir='+ os.path.relpath(output_dir, qtwebengine_root)])
+  args.extend(['-Goutput_dir='+ purifyGypVarPath(os.path.relpath(output_dir, qtwebengine_root))])
 
   # Tell gyp not to try finding cl.exe on Windows, Qt already requires the env to be set prior to the build.
   args.extend(['-G', 'ninja_use_custom_environment_files'])
diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf
index 5b2a85330..044fa94aa 100644
--- a/tools/qmake/mkspecs/features/configure.prf
+++ b/tools/qmake/mkspecs/features/configure.prf
@@ -124,6 +124,9 @@ defineTest(finalizeConfigure) {
         } else {
             log("AppStore Compliant ............... Not enabled         (Default, enable with WEBENGINE_CONFIG+=use_appstore_compliant_code)$${EOL}")
         }
+        !isMinOSXSDKVersion(10, 10, 3) {
+            log("Force Touch API usage ............ Not enabled         (Because the OS X SDK version to be used \"$${WEBENGINE_OSX_SDK_PRODUCT_VERSION}\" is lower than the required \"10.10.3\")$${EOL}")
+        }
     }
 }
 
diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
index 04d3aa40f..ab9593bf9 100644
--- a/tools/qmake/mkspecs/features/functions.prf
+++ b/tools/qmake/mkspecs/features/functions.prf
@@ -37,8 +37,8 @@ defineTest(isPlatformSupported) {
       skipBuild("Qt WebEngine requires OS X version 10.10 or newer.")
       return(false)
     }
-    !isMinOSXSDKVersion(10, 10, 3): {
-      skipBuild("Qt WebEngine requires an OS X SDK version 10.10.3 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.")
+    !isMinOSXSDKVersion(10, 10): {
+      skipBuild("Qt WebEngine requires an OS X SDK version of 10.10 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.")
       return(false)
     }
   } else {
@@ -59,16 +59,20 @@ defineTest(isPlatformSupported) {
 }
 
 defineTest(isPythonVersionSupported) {
-    python_error_msg = "Python version 2 (2.7 or later) is required to build Qt WebEngine."
-    python_major_version = $$system('python -c "import sys; print(sys.version_info[0])"')
+    python_error_msg = "Python version 2 (2.7.5 or later) is required to build Qt WebEngine."
+    python_version = $$system('python -c "import sys; print(sys.version_info[0:3])"')
+    python_version ~= s/[()]//g
+    python_version = $$split(python_version, ',')
+    python_major_version = $$first(python_version)
     greaterThan(python_major_version, 2) {
         skipBuild("Python version 3 is not supported by Chromium.")
         skipBuild($$python_error_msg)
         return(false)
     }
-    python_minor_version = $$system('python -c "import sys; print(sys.version_info[1])"')
-    greaterThan(python_major_version, 1): greaterThan(python_minor_version, 6): return(true)
-    skipBuild("Using Python version "$$python_major_version"."$$python_minor_version".")
+    python_minor_version = $$member(python_version, 1)
+    python_patch_version = $$member(python_version, 2)
+    greaterThan(python_major_version, 1): greaterThan(python_minor_version, 6): greaterThan(python_patch_version, 4): return(true)
+    skipBuild("Using Python version $${python_major_version}.$${python_minor_version}.$${python_patch_version}.")
     skipBuild($$python_error_msg)
     return(false)
 }
@@ -101,6 +105,7 @@ defineTest(isMinOSXSDKVersion) {
     requested_major = $$1
     requested_minor = $$2
     requested_patch = $$3
+    isEmpty(requested_patch): requested_patch = 0
     WEBENGINE_OSX_SDK_PRODUCT_VERSION = $$system("/usr/bin/xcodebuild -sdk $$QMAKE_MAC_SDK -version ProductVersion 2>/dev/null")
     export(WEBENGINE_OSX_SDK_PRODUCT_VERSION)
     isEmpty(WEBENGINE_OSX_SDK_PRODUCT_VERSION) {
@@ -110,6 +115,7 @@ defineTest(isMinOSXSDKVersion) {
     major_version = $$section(WEBENGINE_OSX_SDK_PRODUCT_VERSION, ., 0, 0)
     minor_version = $$section(WEBENGINE_OSX_SDK_PRODUCT_VERSION, ., 1, 1)
     patch_version = $$section(WEBENGINE_OSX_SDK_PRODUCT_VERSION, ., 2, 2)
+    isEmpty(patch_version): patch_version = 0
 
     greaterThan(major_version, $$requested_major):return(true)
     equals(major_version, $$requested_major):greaterThan(minor_version, $$requested_minor):return(true)
diff --git a/tools/qmake/mkspecs/features/gyp_generator.prf b/tools/qmake/mkspecs/features/gyp_generator.prf
index 0ba6de09c..4cf7cd2f4 100644
--- a/tools/qmake/mkspecs/features/gyp_generator.prf
+++ b/tools/qmake/mkspecs/features/gyp_generator.prf
@@ -6,8 +6,8 @@ load(functions)
 load(moc)
 load(resources)
 
-MOC_GEN_DIR = <(SHARED_INTERMEDIATE_DIR)/moc
-RCC_GEN_DIR = <(SHARED_INTERMEDIATE_DIR)/rcc
+MOC_GEN_DIR = $$MOC_DIR
+RCC_GEN_DIR = $$RCC_DIR
 
 defineReplace(mocAction) {
     INPUT_FILE = $$1
@@ -21,11 +21,11 @@ defineReplace(mocAction) {
     OUTPUT_FILE = $$MOC_GEN_DIR/$${OUTPUT_NAME}
     contents = "      {" \
                "        'action_name':'$$OUTPUT_NAME'," \
-               "        'inputs': ['$$INPUT_FILE',]," \
+               "        'inputs': ['$$GYPSRCDIR//$$INPUT_FILE',]," \
                "        'outputs': ['$$OUTPUT_FILE',]," \
                "        'action': ["
     for(token, MOC_COMMAND): contents += "          '$$replace(token,\',)',"
-    contents += "          '$$INPUT_FILE'," \
+    contents += "          '$$GYPSRCDIR/$$INPUT_FILE'," \
                 "          '-o'," \
                 "          '$$OUTPUT_FILE'," \
                 "        ]," \
@@ -42,14 +42,14 @@ defineReplace(rccAction) {
     CLEAN_QMAKE_RCC = $$clean_path($$QMAKE_RCC)
     contents = "      {" \
                "        'action_name':'$$OUTPUT_NAME'," \
-               "        'inputs': ['$$INPUT_FILE',]," \
+               "        'inputs': ['$$GYPSRCDIR//$$INPUT_FILE',]," \
                "        'outputs': ['$$OUTPUT_FILE',]," \
                "        'action': [" \
                "          '$$replace(CLEAN_QMAKE_RCC,\',)',"
     for(resource_flag, $$QMAKE_RESOURCE_FLAGS): contents += "          '$$resource_flag',"
     contents += "          '-name'," \
                 "          '$$EXTERN_FUNC'," \
-                "          '$$INPUT_FILE'," \
+                "          '$$GYPSRCDIR/$$INPUT_FILE'," \
                 "          '-o'," \
                 "          '$$OUTPUT_FILE',"
     contents += "        ]," \
@@ -76,6 +76,12 @@ for (incl, GYPINCLUDES): GYP_CONTENTS += "      '$$incl',"
 GYP_CONTENTS += "    ],"
 }
 
+!isEmpty(GYPDEPENDENCIES) {
+GYP_CONTENTS += "    'dependencies': ["
+for (depend, GYPDEPENDENCIES): GYP_CONTENTS += "      '$$depend',"
+GYP_CONTENTS += "    ],"
+}
+
 !isEmpty(QMAKE_FRAMEWORKPATH) {
     GYP_CONTENTS += "    'mac_framework_dirs': ["
     for(path, QMAKE_FRAMEWORKPATH): GYP_CONTENTS += "      '$$path',"
@@ -107,8 +113,8 @@ GYP_CONTENTS += "    ],"
 
 # Source files to compile
 GYP_CONTENTS += "    'sources': ["
-for (sourcefile, SOURCES): GYP_CONTENTS += "      '$$sourcefile',"
-for (headerfile, HEADERS): GYP_CONTENTS += "      '$$headerfile',"
+for (sourcefile, SOURCES): GYP_CONTENTS += "      '$$GYPSRCDIR/$$sourcefile',"
+for (headerfile, HEADERS): GYP_CONTENTS += "      '$$GYPSRCDIR/$$headerfile',"
 
 # Add Sources generated by rcc from qrc files.
 for (resourcefile, RESOURCES) {
@@ -128,8 +134,6 @@ for (mocable, MOCABLES) {
 GYP_CONTENTS += "    ],"
 GYP_CONTENTS += "    'include_dirs': ["
 for (path, INCLUDEPATH): GYP_CONTENTS += "      '$$path',"
-# qmake already added MOC_DIR to INCLUDEPATH, but we're telling gyp to use a different one.
-GYP_CONTENTS += "      '$$MOC_GEN_DIR',"
 GYP_CONTENTS += "    ],"
 
 # Generate the actions for moc and rcc