AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: Fix build of system jpeg is not available

Browse Source 
Change-Id: Ie7462db556d0615e74755fa4fc3b51f625aade2f
Reviewed-by: Mikhail Svetkin <mikhail.svetkin@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
This commit is contained in:
Kai Koehne 2019-02-11 15:45:33 +01:00
parent 443ee65d3b
commit 7b434c0287
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/configure.cmake
View File

@ -644,7 +644,7 @@ qt_feature("ico" PUBLIC PRIVATE
qt_feature_definition("ico" "QT_NO_ICO" NEGATE VALUE "1") qt_feature_definition("ico" "QT_NO_ICO" NEGATE VALUE "1")
qt_feature("jpeg" PUBLIC PRIVATE qt_feature("jpeg" PUBLIC PRIVATE
LABEL "JPEG" LABEL "JPEG"
CONDITION QT_FEATURE_imageformatplugin CONDITION QT_FEATURE_imageformatplugin AND JPEG_FOUND
DISABLE INPUT_libjpeg STREQUAL 'no' DISABLE INPUT_libjpeg STREQUAL 'no'
) )
qt_feature_definition("jpeg" "QT_NO_IMAGEFORMAT_JPEG" NEGATE) qt_feature_definition("jpeg" "QT_NO_IMAGEFORMAT_JPEG" NEGATE)

3
util/cmake/configurejson2cmake.py
View File

@ -698,6 +698,9 @@ def parseFeature(ctx, feature, data, cm_fh):
'condition': 'NOT QT_FEATURE_icu AND QT_FEATURE_textcodec AND ( TEST_posix_iconv OR TEST_sun_iconv )' 'condition': 'NOT QT_FEATURE_icu AND QT_FEATURE_textcodec AND ( TEST_posix_iconv OR TEST_sun_iconv )'
}, },
'incredibuild_xge': None, 'incredibuild_xge': None,
'jpeg': {
'condition': 'QT_FEATURE_imageformatplugin AND JPEG_FOUND'
},
'ltcg': None, 'ltcg': None,
'msvc_mp': None, 'msvc_mp': None,
'optimize_debug': None, 'optimize_debug': None,