From 7b4671c9fcfb4a49f46cf9db20373a5a230bc35b Mon Sep 17 00:00:00 2001
From: Konstantin Tokarev <annulen@yandex.ru>
Date: Wed, 14 Aug 2019 04:55:53 +0300
Subject: Use libjpeg from Conan on Windows when Qt uses bundled copy

Change-Id: Ibf64e9b2c834ff613b60444676a0b70d47dde319
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
---
 Tools/qmake/projects/run_cmake.pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
     }
-- 
cgit v1.2.3