diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-10 13:08:05 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-10 13:08:05 +0200 |
| commit | 81cbb264cb9446c4408124d50aeff50164ad0ab4 (patch) | |
| tree | 6acc39b8ea0165562d480f1c54608c6c4ae9f865 /Source/CMakeLists.txt | |
| parent | beaeeb99881184fd368c121fcbb1a31c78b794a3 (diff) | |
| parent | 5087e0ced43d813eb6f765913a6fc3958d2a7a9d (diff) | |
| download | qtwebkit-81cbb264cb9446c4408124d50aeff50164ad0ab4.tar.gz | |
Merge remote-tracking branch 'origin/5.212' into dev
Change-Id: I4e185b15690118515df80a79b786cbb8b30dd144
Diffstat (limited to 'Source/CMakeLists.txt')
| -rw-r--r-- | Source/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 9d9483ecc..a473dbf14 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -19,7 +19,7 @@ if (ENABLE_API_TESTS) add_subdirectory(ThirdParty/gtest) endif () -if (USE_WOFF2) +if (USE_WOFF2 AND NOT WOFF2DEC_FOUND) add_subdirectory(ThirdParty/brotli) add_subdirectory(ThirdParty/woff2) endif () |