diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-02-02 17:14:22 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-02-15 20:37:31 +0000 |
| commit | ce7ab499f3fe8fe0a9cb41ee5cca10adb7575ad8 (patch) | |
| tree | 0bea15eb475bfba7ea3395b70c2af1dc1848c876 | |
| parent | 83c3f0b3bbb46f0f24243fdecf7120a2bd5b768c (diff) | |
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 <joerg.bornemann@qt.io>
(cherry picked from commit 01e32d5c4a0ca1da0f31f57b970ef271fe13bd1b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/corelib/CMakeLists.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index 97aaff3cfe..d98dbcce6c 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -1170,7 +1170,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") |