Merge branch '5.6' into dev

Change-Id: I0bb971f01ee1e02da768f336680c8ec0254ab2b0

3 files changed, 35 insertions, 22 deletions

diff --git a/tools/buildscripts/gyp_qtwebengine b/tools/buildscripts/gyp_qtwebengine
index ec24caeb1..d896364ed 100755
--- a/tools/buildscripts/gyp_qtwebengine
+++ b/tools/buildscripts/gyp_qtwebengine
@@ -152,11 +152,6 @@ if __name__ == '__main__':
   args.extend(['-D', 'qtwebengine_root=' + purifyGypVarPath(qtwebengine_root)])
   args.extend(['-D', 'chromium_src_dir=' + purifyGypVarPath(chrome_src)])
 
-  args.extend(['-D', 'clang_use_chrome_plugins=0'])
-  # We do not want to ship more external binary blobs, so let v8 embed its startup data.
-  args.extend(['-D', 'v8_use_external_startup_data=0'])
-  # Trigger Qt-specific build conditions.
-  args.extend(['-D', 'use_qt=1'])
   # 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)])
diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf
index 07fd56d5d..5674ea3a5 100644
--- a/tools/qmake/mkspecs/features/configure.prf
+++ b/tools/qmake/mkspecs/features/configure.prf
@@ -41,7 +41,7 @@ defineTest(runConfigure) {
         else: log("System libwebp or libwebpdemux not found. Using Chromium's copies.$${EOL}")
         packagesExist(libxml-2.0,libxslt): WEBENGINE_CONFIG += use_system_libxslt
         else: log("System libxml2 or libxslt not found. Using Chromium's copies.$${EOL}")
-        for(package, $$list("libevent flac jsoncpp opus")) {
+        for(package, $$list("libevent jsoncpp opus")) {
             packagesExist($$package): WEBENGINE_CONFIG += use_system_$$package
             else: log("System $$package not found. Using Chromium's copy.$${EOL}")
         }
diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
index 2447d8372..2df689bca 100644
--- a/tools/qmake/mkspecs/features/functions.prf
+++ b/tools/qmake/mkspecs/features/functions.prf
@@ -1,30 +1,48 @@
 defineTest(isPlatformSupported) {
-  !linux-g++*:!linux-clang:!win32-msvc2013*:!win32-msvc2015*:!macx-clang*:!boot2qt {
-    skipBuild("Qt WebEngine can currently only be built for Linux (GCC/clang), Windows (MSVC 2013 or 2015), OS X (10.9/XCode 5.1+) or Qt for Device Creation.")
-    return(false)
-  }
-  !contains(QT_CONFIG, c++11) {
-    skipBuild("C++11 support is required in order to build chromium.")
-    return(false)
-  }
-  static {
-    skipBuild("Static builds of QtWebEngine aren't supported.")
-    return(false)
-  }
-  osx {
+  linux {
+    !gcc:!clang {
+      skipBuild("Qt WebEngine on Linux requires clang or GCC.")
+      return(false)
+    }
+    gcc:!clang:!isGCCVersionSupported(): return(false)
+  } else:win32 {
+    winrt {
+      skipBuild("WinRT is not supported.")
+      return(false)
+    }
+    msvc {
+      !equals(MSVC_VER, "12.0"):!equals(MSVC_VER, "14.0") {
+        skipBuild("Qt WebEngine on Windows requires MSVC 2013 or MSVC 2015.")
+        return(false)
+      }
+    } else {
+      skipBuild("Qt WebEngine on Windows requires MSVC 2013 or MSVC 2015.")
+      return(false)
+    }
+  } else:osx {
     lessThan(QMAKE_XCODE_VERSION, 5.1) {
-      skipBuild("Using xcode version $$QMAKE_XCODE_VERSION, but at least version 5.1 is required to build Qt WebEngine.")
+      skipBuild("Using XCode version $$QMAKE_XCODE_VERSION, but at least version 5.1 is required to build Qt WebEngine.")
       return(false)
     }
     # We require OS X 10.9 (darwin version 13.0.0) or newer
     darwin_major_version = $$section(QMAKE_HOST.version, ., 0, 0)
     lessThan(darwin_major_version, 13) {
-      skipBuild("OS X version 10.9 or newer is required to build Qt WebEngine.")
+      skipBuild("Qt WebEngine requires OS X version 10.9 or newer.")
       return(false)
     }
+  } else {
+    skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and OS X.")
+    return(false)
   }
 
-  linux-g++*:!isGCCVersionSupported(): return(false)
+  !contains(QT_CONFIG, c++11) {
+    skipBuild("C++11 support is required in order to build chromium.")
+    return(false)
+  }
+  static {
+    skipBuild("Static builds of QtWebEngine aren't supported.")
+    return(false)
+  }
   !isPythonVersionSupported(): return(false)
   return(true)
 }