Imported WebKit commit bdab88b903fe1a254c80af20161183976670cd3b

Change-Id: Idc1156f4a64df4e7d89e90d4e03451f004c8ae6d
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>

2 files changed, 17 insertions, 0 deletions

diff --git a/Tools/qmake/mkspecs/features/functions.prf b/Tools/qmake/mkspecs/features/functions.prf
index 2dcaa09ca..831e01a98 100644
--- a/Tools/qmake/mkspecs/features/functions.prf
+++ b/Tools/qmake/mkspecs/features/functions.prf
@@ -64,6 +64,10 @@ defineTest(isPlatformSupported) {
     }
 
     win32 {
+        qtConfig(opengles2):!qtConfig(dynamicgl) {
+            skipBuild("QtWebKit supports only dynamic GL Qt builds on Windows at the moment.")
+        }
+
         CONFIG(debug, debug|release):!contains(QMAKE_HOST.arch, x86_64) {
             # debug_and_release is built as release, see Tools/qmake/projects/run_cmake.pro
             !debug_and_release {
@@ -102,6 +106,8 @@ defineTest(isPlatformSupported) {
         skipBuild("C++11 support is required in order to build QtWebKit.")
     }
 
+    isRubyVersionSupported()
+
     isEmpty(skipBuildReason): return(true)
     return(false)
 }
@@ -113,6 +119,13 @@ defineTest(isGCCVersionSupported) {
     return(false)
 }
 
+defineTest(isRubyVersionSupported) {
+    ruby_version = $$system("ruby -e 'puts RUBY_VERSION'")
+    isVersionAtLeast($$ruby_version, "1.9"): return(true)
+    skipBuild("Using Ruby version $$ruby_version, but at least Ruby 1.9 is required to build QtWebKit.")
+    return(false)
+}
+
 defineTest(programExistsInPath) {
     equals(QMAKE_HOST.os, Windows): program = $${1}.exe
     else: program = $$1
diff --git a/Tools/qmake/projects/run_cmake.pro b/Tools/qmake/projects/run_cmake.pro
index 75934e687..1192197bd 100644
--- a/Tools/qmake/projects/run_cmake.pro
+++ b/Tools/qmake/projects/run_cmake.pro
@@ -54,6 +54,10 @@ build_pass|!debug_and_release {
             ZLIB_INCLUDE_DIRS=$$QTBASE_DIR/src/3rdparty/zlib
     }
 
+    qtConfig(opengles2):!qtConfig(dynamicgl) {
+        CMAKE_CONFIG += QT_USES_GLES2_ONLY=1
+    }
+
     exists($$ROOT_BUILD_DIR/conanbuildinfo.cmake):exists($$ROOT_BUILD_DIR/conanfile.txt) {
         CMAKE_CONFIG += QT_CONAN_DIR=$$ROOT_BUILD_DIR
     }