Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7

3 files changed, 28 insertions, 10 deletions

diff --git a/src/core/content_client_qt.cpp b/src/core/content_client_qt.cpp
index 49f0e524d..7fc6556fb 100644
--- a/src/core/content_client_qt.cpp
+++ b/src/core/content_client_qt.cpp
@@ -156,10 +156,11 @@ void AddPepperFlashFromSystem(std::vector<content::PepperPluginInfo>* plugins)
                 << "/usr/lib64/chromium/PepperFlash/libpepflashplayer.so"; // OpenSuSE
     pluginPaths << ppapiPluginsPath() + QStringLiteral("/libpepflashplayer.so");
 #endif
+    std::string flash_version = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(switches::kPpapiFlashVersion);
     for (auto it = pluginPaths.constBegin(); it != pluginPaths.constEnd(); ++it) {
         if (!QFile::exists(*it))
             continue;
-        plugins->push_back(CreatePepperFlashInfo(QtWebEngineCore::toFilePath(*it), std::string()));
+        plugins->push_back(CreatePepperFlashInfo(QtWebEngineCore::toFilePath(*it), flash_version));
     }
 }
 
diff --git a/src/core/content_main_delegate_qt.cpp b/src/core/content_main_delegate_qt.cpp
index 0560c3f6b..ee52dd23e 100644
--- a/src/core/content_main_delegate_qt.cpp
+++ b/src/core/content_main_delegate_qt.cpp
@@ -55,6 +55,10 @@
 #include "renderer/content_renderer_client_qt.h"
 #include "web_engine_library_info.h"
 
+#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX))
+#include "base/cpu.h"
+#endif
+
 #include <QLocale>
 
 namespace QtWebEngineCore {
@@ -69,6 +73,12 @@ static base::StringPiece PlatformResourceProvider(int key) {
 
 void ContentMainDelegateQt::PreSandboxStartup()
 {
+#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX))
+    // Create an instance of the CPU class to parse /proc/cpuinfo and cache
+    // cpu_brand info.
+    base::CPU cpu_info;
+#endif
+
     net::NetModule::SetResourceProvider(PlatformResourceProvider);
     ui::ResourceBundle::InitSharedInstanceWithLocale(WebEngineLibraryInfo::getApplicationLocale(), 0, ui::ResourceBundle::LOAD_COMMON_RESOURCES);
 
diff --git a/src/core/core_module.pro b/src/core/core_module.pro
index 174c00afb..6d2d11d40 100644
--- a/src/core/core_module.pro
+++ b/src/core/core_module.pro
@@ -72,9 +72,13 @@ icu.files = $$OUT_PWD/$$getConfigDir()/icudtl.dat
         locales.path = $$[QT_INSTALL_TRANSLATIONS]/qtwebengine_locales
         resources.CONFIG += no_check_exist
         resources.path = $$[QT_INSTALL_DATA]/resources
-        icu.CONFIG += no_check_exist
-        icu.path = $$[QT_INSTALL_DATA]/resources
-        INSTALLS += icu locales resources
+        INSTALLS += locales resources
+
+        !use?(system_icu) {
+            icu.CONFIG += no_check_exist
+            icu.path = $$[QT_INSTALL_DATA]/resources
+            INSTALLS += icu
+        }
     }
 
     !contains(QT_CONFIG, qt_framework):!force_independent {
@@ -82,11 +86,14 @@ icu.files = $$OUT_PWD/$$getConfigDir()/icudtl.dat
         # Copy essential files to the qtbase build directory for non-prefix builds
         #
 
-        icudt2build.input = icu.files
-        icudt2build.output = $$[QT_INSTALL_DATA/get]/resources/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT}
-        icudt2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-        icudt2build.name = COPY ${QMAKE_FILE_IN}
-        icudt2build.CONFIG = no_link no_clean target_predeps
+        !use?(system_icu) {
+            icudt2build.input = icu.files
+            icudt2build.output = $$[QT_INSTALL_DATA/get]/resources/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT}
+            icudt2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
+            icudt2build.name = COPY ${QMAKE_FILE_IN}
+            icudt2build.CONFIG = no_link no_clean target_predeps
+            QMAKE_EXTRA_COMPILERS += icudt2build
+        }
 
         resources2build.input = resources.files
         resources2build.output = $$[QT_INSTALL_DATA/get]/resources/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT}
@@ -94,7 +101,7 @@ icu.files = $$OUT_PWD/$$getConfigDir()/icudtl.dat
         resources2build.name = COPY ${QMAKE_FILE_IN}
         resources2build.CONFIG = no_link no_clean target_predeps
 
-        QMAKE_EXTRA_COMPILERS += icudt2build resources2build
+        QMAKE_EXTRA_COMPILERS += resources2build
     }
 }