Imported WebKit commit 12fbea815480c3b3fad139cd8dfb82e8c954bc9a

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

5 files changed, 31 insertions, 26 deletions

diff --git a/Tools/qmake/mkspecs/features/functions.prf b/Tools/qmake/mkspecs/features/functions.prf
index daab9b8b5..2dcaa09ca 100644
--- a/Tools/qmake/mkspecs/features/functions.prf
+++ b/Tools/qmake/mkspecs/features/functions.prf
@@ -3,6 +3,11 @@ EOL = $$escape_expand(\\n)
 WEBKIT_SUBDIR = $$relative_path($$_PRO_FILE_PWD_, $$ROOT_WEBKIT_DIR)
 QTBASE_DIR = $$ROOT_WEBKIT_DIR/../qtbase
 
+defineReplace(staticLibPath) {
+    lib_basename = $${QMAKE_PREFIX_STATICLIB}$${1}$$qtPlatformTargetSuffix()
+    return($$ROOT_BUILD_DIR/lib/$${lib_basename}.$$QMAKE_EXTENSION_STATICLIB)
+}
+
 defineTest(isQtMinimum) {
     !equals(QT_MAJOR_VERSION, $$1): return(false)
     count(ARGS, 1, greaterThan) {
@@ -59,6 +64,12 @@ defineTest(isPlatformSupported) {
     }
 
     win32 {
+        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 {
+                skipBuild("QtWebKit requires a 64-bit toolchain for debug build")
+            }
+        }
         winrt {
             skipBuild("WinRT is not supported.")
         }
diff --git a/Tools/qmake/projects/generate_cmake_toolchain_file.pro b/Tools/qmake/projects/generate_cmake_toolchain_file.pro
index db26391b0..845372158 100644
--- a/Tools/qmake/projects/generate_cmake_toolchain_file.pro
+++ b/Tools/qmake/projects/generate_cmake_toolchain_file.pro
@@ -37,9 +37,6 @@ TOOLCHAIN_FILE_VARS += \
     "CMAKE_C_COMPILER \"$$QMAKE_CC\"" \
     "CMAKE_CXX_COMPILER \"$$QMAKE_CXX\""
 
-CONANBUILDINFO_PATH = $$ROOT_BUILD_DIR/conanbuildinfo.cmake
-exists($$CONANBUILDINFO_PATH): TOOLCHAIN_FILE_VARS += "CONANBUILDINFO_PATH $$CONANBUILDINFO_PATH"
-
 for (var, TOOLCHAIN_FILE_VARS): TOOLCHAIN_FILE_CONTENTS += "set($$var)"
 
 TOOLCHAIN_FILE = $$ROOT_BUILD_DIR/qmake_toolchain.cmake
diff --git a/Tools/qmake/projects/qtjpeg/qtjpeg.pro b/Tools/qmake/projects/qtjpeg/qtjpeg.pro
index 89d3e6113..a0c817a47 100644
--- a/Tools/qmake/projects/qtjpeg/qtjpeg.pro
+++ b/Tools/qmake/projects/qtjpeg/qtjpeg.pro
@@ -8,16 +8,7 @@ CONFIG += \
     exceptions_off rtti_off warn_off \
     installed
 
-# Poor man's qt_helper_lib
-TEMPLATE = lib
-CONFIG += staticlib
-CONFIG -= qt
-
-# In debug_and_release build we need only one copy of library, let it be release
-debug_and_release {
-    CONFIG -= debug_and_release debug
-    CONFIG += release
-}
+load(qt_helper_lib)
 
 DESTDIR = $$ROOT_BUILD_DIR/lib
 
diff --git a/Tools/qmake/projects/qtpng/qtpng.pro b/Tools/qmake/projects/qtpng/qtpng.pro
index 88b6f9672..b6512f012 100644
--- a/Tools/qmake/projects/qtpng/qtpng.pro
+++ b/Tools/qmake/projects/qtpng/qtpng.pro
@@ -12,16 +12,7 @@ CONFIG += \
     exceptions_off rtti_off warn_off \
     installed
 
-# Poor man's qt_helper_lib
-TEMPLATE = lib
-CONFIG += staticlib
-CONFIG -= qt
-
-# In debug_and_release build we need only one copy of library, let it be release
-debug_and_release {
-    CONFIG -= debug_and_release debug
-    CONFIG += release
-}
+load(qt_helper_lib)
 
 DESTDIR = $$ROOT_BUILD_DIR/lib
 PNGDIR = $$QTBASE_DIR/src/3rdparty/libpng
diff --git a/Tools/qmake/projects/run_cmake.pro b/Tools/qmake/projects/run_cmake.pro
index 55e4ccc17..14c248ced 100644
--- a/Tools/qmake/projects/run_cmake.pro
+++ b/Tools/qmake/projects/run_cmake.pro
@@ -4,6 +4,14 @@ ROOT_QT_BUILD_DIR = $$ROOT_BUILD_DIR/..
 
 TEMPLATE = aux
 
+win32:!contains(QMAKE_HOST.arch, x86_64) {
+    debug_and_release {
+        warning("Skipping debug build of QtWebKit because it requires a 64-bit toolchain")
+        CONFIG -= debug_and_release debug
+        CONFIG += release
+    }
+}
+
 CONFIG(debug, debug|release) {
     configuration = Debug
 } else {
@@ -20,22 +28,25 @@ build_pass|!debug_and_release {
         CMAKE_TOOLCHAIN_FILE=$$toolchain_file \
         CMAKE_PREFIX_PATH=\"$$[QT_INSTALL_PREFIX];$$ROOT_QT_BUILD_DIR/qtbase;$$ROOT_QT_BUILD_DIR/qtlocation;$$ROOT_QT_BUILD_DIR/qtsensors\" \
         CMAKE_INSTALL_PREFIX=\"$$[QT_INSTALL_PREFIX]\" \
-        ENABLE_TEST_SUPPORT=OFF \
         USE_LIBHYPHEN=OFF
 
+    static: CMAKE_CONFIG += USE_THIN_ARCHIVES=OFF
+
+    static_runtime: CMAKE_CONFIG += USE_STATIC_RUNTIME=ON
+
     QT_FOR_CONFIG += gui-private
     !qtConfig(system-jpeg):exists($$QTBASE_DIR) {
         CMAKE_CONFIG += \
             QT_BUNDLED_JPEG=1 \
             JPEG_INCLUDE_DIR=$$QTBASE_DIR/src/3rdparty/libjpeg \
-            JPEG_LIBRARIES=$$ROOT_BUILD_DIR/lib/$${QMAKE_PREFIX_STATICLIB}qtjpeg.$$QMAKE_EXTENSION_STATICLIB
+            JPEG_LIBRARIES=$$staticLibPath(qtjpeg)
     }
 
     !qtConfig(system-png):qtConfig(png):exists($$QTBASE_DIR) {
         CMAKE_CONFIG += \
             QT_BUNDLED_PNG=1 \
             PNG_INCLUDE_DIRS=$$QTBASE_DIR/src/3rdparty/libpng \
-            PNG_LIBRARIES=$$ROOT_BUILD_DIR/lib/$${QMAKE_PREFIX_STATICLIB}qtpng.$$QMAKE_EXTENSION_STATICLIB
+            PNG_LIBRARIES=$$staticLibPath(qtpng)
     }
 
     !qtConfig(system-zlib):exists($$QTBASE_DIR) {
@@ -44,6 +55,10 @@ build_pass|!debug_and_release {
             ZLIB_INCLUDE_DIRS=$$QTBASE_DIR/src/3rdparty/zlib
     }
 
+    exists($$ROOT_BUILD_DIR/conanbuildinfo.cmake):exists($$ROOT_BUILD_DIR/conanfile.txt) {
+        CMAKE_CONFIG += QT_CONAN_DIR=$$ROOT_BUILD_DIR
+    }
+
     equals(QMAKE_HOST.os, Windows) {
         if(equals(MAKEFILE_GENERATOR, MSVC.NET)|equals(MAKEFILE_GENERATOR, MSBUILD)) {
             cmake_generator = "NMake Makefiles JOM"