diff options
| -rw-r--r-- | cmake/QtFlagHandlingHelpers.cmake | 2 | ||||
| -rw-r--r-- | src/corelib/io/qntdll_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmake/QtFlagHandlingHelpers.cmake b/cmake/QtFlagHandlingHelpers.cmake index b36f6cff0c..a4a989ee60 100644 --- a/cmake/QtFlagHandlingHelpers.cmake +++ b/cmake/QtFlagHandlingHelpers.cmake @@ -148,7 +148,7 @@ function(qt_internal_set_exceptions_flags target exceptions_on) if(exceptions_on) if(MSVC) set(_flag "/EHsc") - if(MSVC_VERSION GREATER_EQUAL 1929) + if((MSVC_VERSION GREATER_EQUAL 1929) AND NOT CLANG) set(_flag ${_flag} "/d2FH4") endif() endif() diff --git a/src/corelib/io/qntdll_p.h b/src/corelib/io/qntdll_p.h index caf34ddb5f..893bf40d23 100644 --- a/src/corelib/io/qntdll_p.h +++ b/src/corelib/io/qntdll_p.h @@ -68,7 +68,7 @@ typedef struct _FILE_FS_SECTOR_SIZE_INFORMATION { ULONG ByteOffsetForPartitionAlignment; } FILE_FS_SECTOR_SIZE_INFORMATION, *PFILE_FS_SECTOR_SIZE_INFORMATION; -#if !defined(Q_CC_CLANG) && !defined(Q_CC_MINGW) +#if !defined(Q_CC_MINGW) // keep the following enumeration as is, taken from // https://docs.microsoft.com/en-us/windows-hardware/drivers/ddi/wdm/ne-wdm-_fsinfoclass // Unfortunately we can't include the wdm.h header, so we duplicate the code here. |