diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-11 12:44:19 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-11 12:44:19 +0200 |
| commit | ab1bd15209abaf7effc51dbc2f272c5681af7223 (patch) | |
| tree | 680bfbc4ab13514a9d2288609377bd8461f1d9f6 /Tools | |
| parent | 5909e6d0d10de3e1370b3ea0bc596f580101e3b4 (diff) | |
| parent | 2eac3aeb98fca0e6c13aaaff481861c5ef679e68 (diff) | |
| download | qtwebkit-dev.tar.gz | |
Change-Id: I2b773e6958cf1d3699ff7887f2807572f1dafa8d
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/qmake/projects/run_cmake.pro | 7 | ||||
| -rw-r--r-- | Tools/qt/manifest.txt | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/Tools/qmake/projects/run_cmake.pro b/Tools/qmake/projects/run_cmake.pro index 5cdd40a77..71872664b 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. @@ -81,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) { 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 |