From 6bfa626a38e9968fb65b4ecc4a5967ddf78622f4 Mon Sep 17 00:00:00 2001 From: Garux Date: Thu, 27 Oct 2022 10:30:27 +0300 Subject: [PATCH] fix ubuntu build, suppress spammy warning there --- .github/workflows/build.yml | 2 +- radiant/mainframe.cpp | 1 + radiant/map.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ed630e76..f2427b62 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -75,7 +75,7 @@ jobs: - name: Build run: | - make -j 4 DOWNLOAD_GAMEPACKS=no CXXFLAGS="-Wno-deprecated-declarations" + make -j 4 DOWNLOAD_GAMEPACKS=no CXXFLAGS="-Wno-deprecated-copy" wget https://www.dropbox.com/s/b1xpajzfa6yjlzf/netradiant-custom-extra-gamepacks.zip unzip -o netradiant-custom-extra-gamepacks.zip -d "install" diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp index e52511a2..cb978641 100644 --- a/radiant/mainframe.cpp +++ b/radiant/mainframe.cpp @@ -65,6 +65,7 @@ #include "signal/isignal.h" #include "os/path.h" #include "os/file.h" +#include #include "eclasslib.h" #include "moduleobservers.h" diff --git a/radiant/map.cpp b/radiant/map.cpp index 24b48852..a8c19e26 100644 --- a/radiant/map.cpp +++ b/radiant/map.cpp @@ -922,7 +922,7 @@ void DoMapInfo(){ { auto item = new QTreeWidgetItem( tree ); item->setData( 0, Qt::ItemDataRole::DisplayRole, name.c_str() ); - item->setData( 1, Qt::ItemDataRole::DisplayRole, count ); + item->setData( 1, Qt::ItemDataRole::DisplayRole, int( count ) ); } }