diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-02-02 17:14:22 +0100 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-02-15 15:07:33 +0000 |
| commit | 01e32d5c4a0ca1da0f31f57b970ef271fe13bd1b (patch) | |
| tree | c330b996af6a45ccf0b811f8023fdf34e4efed03 | |
| parent | 0c51a8756377c40180619046d07b35718fcf1784 (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
Pick-to: 6.0
Pick-to: 6.1
Change-Id: I5c0dbd761b7726589fdf6970cd546af89d2ff837
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -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 2ce6224a60..1106aaae71 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -1171,7 +1171,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") |