From 1482978d1e764e0c31c2df8890913d6801a8e065 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Wed, 11 Sep 2019 12:41:53 +0300 Subject: Import QtWebKit commit 68b093f76fd3ee458de9d1bbf54e1d5a648a71bd Change-Id: I62abae1d1e60d2cb65514d01fa89ad44308a6ba4 Reviewed-by: Konstantin Tokarev --- Tools/qmake/projects/run_cmake.pro | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Tools') diff --git a/Tools/qmake/projects/run_cmake.pro b/Tools/qmake/projects/run_cmake.pro index 5cdd40a77..345e43a01 100644 --- a/Tools/qmake/projects/run_cmake.pro +++ b/Tools/qmake/projects/run_cmake.pro @@ -63,6 +63,11 @@ build_pass|!debug_and_release { CMAKE_CONFIG += USE_MINIMAL_DEBUG_INFO_MSVC=ON } + !macos { + force_debug_info: CMAKE_CONFIG += FORCE_DEBUG_INFO=ON + qtConfig(separate_debug_info): CMAKE_CONFIG += SEPARATE_DEBUG_INFO=ON + } + macos { # Reuse the cached sdk version value from mac/sdk.prf if available # otherwise query for it. -- cgit v1.2.1 From 3395426ab651a631aca8ee6b0a694a71df19100f Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Thu, 3 Oct 2019 22:48:16 +0300 Subject: Import QtWebKit commit 49b749171e786df3adcd7a755df428c1846acd69 Change-Id: I4c82d8030969d941bb78b1cc4e77c0a66db8da2c Reviewed-by: Konstantin Tokarev --- Tools/qt/manifest.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Tools') diff --git a/Tools/qt/manifest.txt b/Tools/qt/manifest.txt index 39414cc5f..364b7d464 100644 --- a/Tools/qt/manifest.txt +++ b/Tools/qt/manifest.txt @@ -157,3 +157,5 @@ file Tools/Scripts/webkitperl/FeatureList.pm file Tools/jhbuild/jhbuildutils.py file WebKit.pro file .qmake.conf + +directory tests -- cgit v1.2.1 From 2eac3aeb98fca0e6c13aaaff481861c5ef679e68 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Tue, 8 Oct 2019 01:20:22 +0300 Subject: Import QtWebKit commit 5e53102492e5ce85bda2657468f1369a0173c2ce Change-Id: Id71d7c7f5eafe58f7bd8c46a2a07fd0bad015628 Reviewed-by: Konstantin Tokarev --- Tools/qmake/projects/run_cmake.pro | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Tools') diff --git a/Tools/qmake/projects/run_cmake.pro b/Tools/qmake/projects/run_cmake.pro index 345e43a01..71872664b 100644 --- a/Tools/qmake/projects/run_cmake.pro +++ b/Tools/qmake/projects/run_cmake.pro @@ -86,6 +86,8 @@ build_pass|!debug_and_release { !qt_framework: CMAKE_CONFIG += MACOS_BUILD_FRAMEWORKS=OFF } + linux:isEqual(EXTRA_RPATHS, "."): CMAKE_CONFIG += QT_ORIGIN_RPATH=ON + !isEmpty(use_ninja): cmake_args += "-G Ninja" equals(QMAKE_HOST.os, Windows) { -- cgit v1.2.1