From e6a845ad88d0638a43c526f0de4115d9546b00a2 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 11 Nov 2019 19:17:10 +0100 Subject: Regenerate a bunch of projects after pro2cmake changes Change-Id: I675a068411785364915a074ca0e631fec944d228 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann --- src/corelib/.prev_CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/corelib/.prev_CMakeLists.txt') diff --git a/src/corelib/.prev_CMakeLists.txt b/src/corelib/.prev_CMakeLists.txt index dd11847011..74f2d631e1 100644 --- a/src/corelib/.prev_CMakeLists.txt +++ b/src/corelib/.prev_CMakeLists.txt @@ -431,7 +431,7 @@ extend_target(Core CONDITION INTEGRITY #### Keys ignored in scope 21:.:global:global/global.pri:CLANG OR intel_icl OR ICC: # f16c_cxx = "false" -#### Keys ignored in scope 23:.:global:global/global.pri:GCC AND f16c AND TEST_architecture_arch STREQUAL x86imdAlways: +#### Keys ignored in scope 23:.:global:global/global.pri:GCC AND f16c AND x86SimdAlways: # f16c_cxx = "true" #### Keys ignored in scope 25:.:global:global/global.pri:MSVC AND QT_CPU_FEATURES__ss_QT_ARCH___contains___avx: @@ -1024,7 +1024,7 @@ if(QT_FEATURE_mimetype AND QT_FEATURE_mimetype_database) set(mimetypes_resource_files "mime/packages/freedesktop.org.xml" ) - + add_qt_resource(Core "mimetypes" PREFIX "/qt-project.org/qmime/packages" -- cgit v1.2.3