diff options
Diffstat (limited to 'Tools/qmake/projects/run_cmake.pro')
| -rw-r--r-- | Tools/qmake/projects/run_cmake.pro | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/Tools/qmake/projects/run_cmake.pro b/Tools/qmake/projects/run_cmake.pro index f63fcd658..5cdd40a77 100644 --- a/Tools/qmake/projects/run_cmake.pro +++ b/Tools/qmake/projects/run_cmake.pro @@ -35,15 +35,9 @@ build_pass|!debug_and_release { static_runtime: CMAKE_CONFIG += USE_STATIC_RUNTIME=ON QT_FOR_CONFIG += gui-private - !qtConfig(system-jpeg):exists($$QTBASE_DIR) { - CMAKE_CONFIG += \ - QT_BUNDLED_JPEG=1 \ - JPEG_LIBRARIES=$$staticLibPath(qtjpeg) - - exists($$QTBASE_DIR/src/3rdparty/libjpeg/src/jpeglib.h): \ - CMAKE_CONFIG += JPEG_INCLUDE_DIR=$$QTBASE_DIR/src/3rdparty/libjpeg/src - else: \ - CMAKE_CONFIG += JPEG_INCLUDE_DIR=$$QTBASE_DIR/src/3rdparty/libjpeg + !win32:!qtConfig(system-jpeg):qtConfig(jpeg) { + # Use QImageReader for JPEG + CMAKE_CONFIG += USE_LIBJPEG=OFF } !qtConfig(system-png):qtConfig(png):exists($$QTBASE_DIR) { @@ -83,6 +77,8 @@ build_pass|!debug_and_release { debug_and_release:build_all:CONFIG(debug, debug|release) { CMAKE_CONFIG += CMAKE_INSTALL_PREFIX=\"$$[QT_INSTALL_PREFIX]/debug\" } + + !qt_framework: CMAKE_CONFIG += MACOS_BUILD_FRAMEWORKS=OFF } !isEmpty(use_ninja): cmake_args += "-G Ninja" |