From 08eaf858c99ad6be4eaa0d97509a3400eb5186f2 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Tue, 15 Sep 2020 02:28:35 +0300 Subject: Import QtWebKit commit cf37bc44f798d3c5a26d17086ada92688b9bfe6d Change-Id: I4d0c7ab5ea4e63983d0bb62111c23f9604f0ee61 Reviewed-by: Konstantin Tokarev --- Tools/qt/conanfile.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Tools/qt/conanfile.py b/Tools/qt/conanfile.py index cecdd677d..c292ce221 100644 --- a/Tools/qt/conanfile.py +++ b/Tools/qt/conanfile.py @@ -47,6 +47,8 @@ class QtWebKitConan(ConanFile): "install_prefix": "ANY" } default_options = { + "install_prefix": None, + "icu:shared": True, "icu:data_packaging": "library", @@ -132,6 +134,8 @@ class QtWebKitConan(ConanFile): if self.options.install_prefix: cmake.definitions["CMAKE_INSTALL_PREFIX"] = str(self.options.install_prefix) + else: + del cmake.definitions["CMAKE_INSTALL_PREFIX"] print(self.source_folder) print() -- cgit v1.2.1