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

Change-Id: I1ac58ada3f32821d62d49e5fcb12546aa9e75fb4

src/core/download_manager_delegate_qt.cpp

@@ -40,6 +40,7 @@
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/save_page_type.h"
 #include "content/public/browser/web_contents.h"
+#include "net/http/http_content_disposition.h"
 
 #include <QDir>
 #include <QFile>
@@ -103,6 +104,9 @@ bool DownloadManagerDelegateQt::DetermineDownloadTarget(content::DownloadItem* i
 
     std::string suggestedFilename = item->GetSuggestedFilename();
 
+    if (suggestedFilename.empty())
+        suggestedFilename = net::HttpContentDisposition(item->GetContentDisposition(), std::string()).filename();
+
     if (suggestedFilename.empty())
         suggestedFilename = item->GetTargetFilePath().AsUTF8Unsafe();
 

tools/qmake/mkspecs/features/functions.prf

@@ -22,11 +22,18 @@ defineTest(isPlatformSupported) {
 }
 
 defineTest(isPythonVersionSupported) {
-  python_major_version = $$system('python -c "import sys; print sys.version_info.major"')
-  python_minor_version = $$system('python -c "import sys; print sys.version_info.minor"')
-  lessThan(python_major_version, 3): greaterThan(python_major_version, 1): greaterThan(python_minor_version, 6): return(true)
-  skipBuild("Using Python version "$$python_major_version"."$$python_minor_version", but Python version 2 (2.7 or later) is required to build Qt WebEngine.")
-  return(false)
+    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])"')
+    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".")
+    skipBuild($$python_error_msg)
+    return(false)
 }
 
 defineTest(isGCCVersionSupported) {