From 403213240c7b2dc09378e1cb8c147131e368f90c Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 22 Sep 2020 10:16:58 +0200 Subject: CMake: Regenerate projects to use new qt_internal_ API Modify special case locations to use the new API as well. Clean up some stale .prev files that are not needed anymore. Clean up some project files that are not used anymore. Task-number: QTBUG-86815 Change-Id: I9947da921f98686023c6bb053dfcc101851276b5 Reviewed-by: Joerg Bornemann Reviewed-by: Qt CI Bot --- src/plugins/imageformats/jpeg/.prev_CMakeLists.txt | 6 +++--- src/plugins/imageformats/jpeg/CMakeLists.txt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/plugins/imageformats') diff --git a/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt b/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt index 95b3aceff5..bab14249d6 100644 --- a/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt +++ b/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt @@ -23,12 +23,12 @@ qt_internal_add_plugin(QJpegPlugin ## Scopes: ##################################################################### -qt_extend_target(QJpegPlugin CONDITION QT_FEATURE_system_jpeg +qt_internal_extend_target(QJpegPlugin CONDITION QT_FEATURE_system_jpeg PUBLIC_LIBRARIES JPEG::JPEG ) -qt_extend_target(QJpegPlugin CONDITION NOT QT_FEATURE_system_jpeg +qt_internal_extend_target(QJpegPlugin CONDITION NOT QT_FEATURE_system_jpeg SOURCES ../../../3rdparty/libjpeg/src/jaricom.c ../../../3rdparty/libjpeg/src/jcapimin.c @@ -88,7 +88,7 @@ qt_extend_target(QJpegPlugin CONDITION NOT QT_FEATURE_system_jpeg #### Keys ignored in scope 5:.:../../../3rdparty:../../../3rdparty/libjpeg.pri:GCC: # QMAKE_CFLAGS_WARN_ON = "-Wno-unused-parameter" "-Wno-main" -qt_extend_target(QJpegPlugin CONDITION MSVC AND NOT QT_FEATURE_system_jpeg +qt_internal_extend_target(QJpegPlugin CONDITION MSVC AND NOT QT_FEATURE_system_jpeg DEFINES _CRT_SECURE_NO_WARNINGS ) diff --git a/src/plugins/imageformats/jpeg/CMakeLists.txt b/src/plugins/imageformats/jpeg/CMakeLists.txt index 52c3aa6911..7e69e1aba6 100644 --- a/src/plugins/imageformats/jpeg/CMakeLists.txt +++ b/src/plugins/imageformats/jpeg/CMakeLists.txt @@ -25,12 +25,12 @@ qt_internal_add_plugin(QJpegPlugin ## Scopes: ##################################################################### -qt_extend_target(QJpegPlugin CONDITION QT_FEATURE_system_jpeg +qt_internal_extend_target(QJpegPlugin CONDITION QT_FEATURE_system_jpeg PUBLIC_LIBRARIES JPEG::JPEG ) -qt_extend_target(QJpegPlugin CONDITION NOT QT_FEATURE_system_jpeg +qt_internal_extend_target(QJpegPlugin CONDITION NOT QT_FEATURE_system_jpeg SOURCES ../../../3rdparty/libjpeg/src/jaricom.c ../../../3rdparty/libjpeg/src/jcapimin.c @@ -98,7 +98,7 @@ endif() #### Keys ignored in scope 5:.:../../../3rdparty:../../../3rdparty/libjpeg.pri:GCC: # QMAKE_CFLAGS_WARN_ON = "-Wno-unused-parameter" "-Wno-main" -qt_extend_target(QJpegPlugin CONDITION MSVC AND NOT QT_FEATURE_system_jpeg +qt_internal_extend_target(QJpegPlugin CONDITION MSVC AND NOT QT_FEATURE_system_jpeg DEFINES _CRT_SECURE_NO_WARNINGS ) -- cgit v1.2.3