diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-11 19:17:10 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-12 13:16:08 +0000 |
| commit | e6a845ad88d0638a43c526f0de4115d9546b00a2 (patch) | |
| tree | f058c7d0c4a1748a6c3062798364e12c0d30e805 /src/corelib/.prev_CMakeLists.txt | |
| parent | a0967c2a4f171e9edf6edef0c2ea966500343563 (diff) | |
Regenerate a bunch of projects after pro2cmake changes
Change-Id: I675a068411785364915a074ca0e631fec944d228
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/corelib/.prev_CMakeLists.txt')
| -rw-r--r-- | src/corelib/.prev_CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
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" |