diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2019-08-14 04:55:53 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2019-08-28 14:36:19 +0300 |
| commit | 7b4671c9fcfb4a49f46cf9db20373a5a230bc35b (patch) | |
| tree | 5b83726f60ba05e2aaa9ccc653ab8681d9070a83 | |
| parent | 0b3aa2c8d05a54a0837cb5a49fd03aa4a34957f0 (diff) | |
| download | qtwebkit-7b4671c9fcfb4a49f46cf9db20373a5a230bc35b.tar.gz | |
Use libjpeg from Conan on Windows when Qt uses bundled copy
Change-Id: Ibf64e9b2c834ff613b60444676a0b70d47dde319
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
| -rw-r--r-- | Tools/qmake/projects/run_cmake.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tools/qmake/projects/run_cmake.pro b/Tools/qmake/projects/run_cmake.pro index ff6d1d562..5cdd40a77 100644 --- a/Tools/qmake/projects/run_cmake.pro +++ b/Tools/qmake/projects/run_cmake.pro @@ -35,7 +35,7 @@ build_pass|!debug_and_release { static_runtime: CMAKE_CONFIG += USE_STATIC_RUNTIME=ON QT_FOR_CONFIG += gui-private - !qtConfig(system-jpeg):qtConfig(jpeg) { + !win32:!qtConfig(system-jpeg):qtConfig(jpeg) { # Use QImageReader for JPEG CMAKE_CONFIG += USE_LIBJPEG=OFF } |