Merge pull request #9715 from iwubcode/qt-header-warnings

DolphinQt: ignore warnings from qt headers on buildbot

Source/Core/DolphinQt/CMakeLists.txt

@@ -350,10 +350,11 @@ if (WIN32)
 endif()
 
 if (MSVC)
-  # Disable some warnings
+  # Don't propogate warnings in qt headers to Dolphin
-
+  target_compile_options(dolphin-emu PRIVATE /experimental:external)
-  # 5054: operator '+': deprecated between enumerations of different types (in Qt headers)
+  target_compile_options(dolphin-emu PRIVATE /external:W0)
-  target_compile_options(dolphin-emu PRIVATE /wd5054)
+  target_compile_options(dolphin-emu PRIVATE "/external:I${Qt5Gui_PRIVATE_INCLUDE_DIRS}")
+  target_compile_options(dolphin-emu PRIVATE "/external:I${Qt5Widgets_PRIVATE_INCLUDE_DIRS}")
 endif()
 
 if(WIN32)

Source/Core/DolphinQt/QtUtils/FlowLayout.cpp

@@ -66,8 +66,7 @@ FlowLayout::FlowLayout(int margin, int h_spacing, int v_spacing)
 
 FlowLayout::~FlowLayout()
 {
-  QLayoutItem* item;
+  while (QLayoutItem* item = takeAt(0))
-  while ((item = takeAt(0)))
     delete item;
 }
 

Source/VSProps/QtCompile.props

@@ -28,10 +28,11 @@
       <AdditionalIncludeDirectories>$(QtIncludeDir)QtWidgets;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Platform)'=='ARM64'">$(QtIncludeDir)QtANGLE;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <!--
-      Negate the previously enabled warning (set in Base.props). Not compatible with QtCore\qtmap.h
+      Set the qt directories as 'external', so we avoid any warnings in them
-      This isn't too bad since we live with the fact that Qt-using projects will have different compiler args already.
       -->
-      <AdditionalOptions>%(AdditionalOptions) /wd4946</AdditionalOptions>
+      <AdditionalOptions>%(AdditionalOptions) /experimental:external</AdditionalOptions>
+      <AdditionalOptions>%(AdditionalOptions) /external:W0</AdditionalOptions>
+      <AdditionalOptions>%(AdditionalOptions) /external:I$(QtIncludeDir)</AdditionalOptions>
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>$(QtLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>