diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2020-09-15 02:28:35 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2020-09-15 02:30:01 +0300 |
| commit | 08eaf858c99ad6be4eaa0d97509a3400eb5186f2 (patch) | |
| tree | d54ad54949e71d26f5de0f63735185421cbf52a0 | |
| parent | 412e257d01c56fd1a6326ccc5a401c316276ffb8 (diff) | |
| download | qtwebkit-08eaf858c99ad6be4eaa0d97509a3400eb5186f2.tar.gz | |
Import QtWebKit commit cf37bc44f798d3c5a26d17086ada92688b9bfe6d
Change-Id: I4d0c7ab5ea4e63983d0bb62111c23f9604f0ee61
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
| -rw-r--r-- | Tools/qt/conanfile.py | 4 |
1 files changed, 4 insertions, 0 deletions
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() |