ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

DolphinQt: ignore warnings from qt headers on buildbot
This commit is contained in:
Mat M 2021-05-15 17:34:57 -04:00 committed by GitHub
parent b3bceb2c11 99a724361a
commit b4ec550782
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/DolphinQt/CMakeLists.txt
View File

@ -350,10 +350,11 @@ if (WIN32)
endif()
if (MSVC)
# Disable some warnings
# 5054: operator '+': deprecated between enumerations of different types (in Qt headers)
target_compile_options(dolphin-emu PRIVATE /wd5054)
# Don't propogate warnings in qt headers to Dolphin
target_compile_options(dolphin-emu PRIVATE /experimental:external)
target_compile_options(dolphin-emu PRIVATE /external:W0)
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)

3
Source/Core/DolphinQt/QtUtils/FlowLayout.cpp
View File

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

7
Source/VSProps/QtCompile.props
View File

@ -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
This isn't too bad since we live with the fact that Qt-using projects will have different compiler args already.
Set the qt directories as 'external', so we avoid any warnings in them
-->
<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>