From 4d1808e502222928d98e388a3875acda19818df5 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Tue, 2 Feb 2021 17:14:22 +0100 Subject: Remove the corelib_add_mimetypes_resources call for the Core library Looks like the corelib_add_mimetypes_resources call is redundant and deprecated. It duplicates the mime-type database in the Core library. This also fixes the static build of the qmimedatabase tests, since avoids propagation of the resource symbols by the Core library. Fixes: QTBUG-89952 Change-Id: I5c0dbd761b7726589fdf6970cd546af89d2ff837 Reviewed-by: Joerg Bornemann (cherry picked from commit 01e32d5c4a0ca1da0f31f57b970ef271fe13bd1b) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'src/corelib') diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index c4461da6b5..76e4915cc7 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -1152,7 +1152,6 @@ qt_internal_extend_target(Core CONDITION QT_FEATURE_mimetype # edited qrc files. if(QT_FEATURE_mimetype AND QT_FEATURE_mimetype_database) include(${CMAKE_CURRENT_SOURCE_DIR}/mimetypes/mimetypes_resources.cmake) - corelib_add_mimetypes_resources(Core) # Generate qmimeprovider_database.cpp set(qmimeprovider_db_output "${CMAKE_CURRENT_BINARY_DIR}/.rcc/qmimeprovider_database.cpp") -- cgit v1.2.3