From aeba818634fa33f460e34843faa30abe57a59118 Mon Sep 17 00:00:00 2001 From: FearlessTobi Date: Sun, 17 Jan 2021 02:48:52 +0100 Subject: [PATCH] citra_qt: Migrate off of setMargin() to setContentsMargins() setMargin() has been deprecated since Qt 5, and replaced with setContentsMargins(). We can move over to setContentsMargins() to stay forward-compatible with Qt 6.0. Co-Authored-By: LC <712067+lioncash@users.noreply.github.com> --- src/citra_qt/bootmanager.cpp | 2 +- src/citra_qt/game_list.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index 18f7e8ea6..0607a23af 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp @@ -195,7 +195,7 @@ GRenderWindow::GRenderWindow(QWidget* parent_, EmuThread* emu_thread) QString::fromUtf8(Common::g_scm_desc))); setAttribute(Qt::WA_AcceptTouchEvents); auto layout = new QHBoxLayout(this); - layout->setMargin(0); + layout->setContentsMargins(0, 0, 0, 0); setLayout(layout); InputCommon::Init(); diff --git a/src/citra_qt/game_list.cpp b/src/citra_qt/game_list.cpp index 162e1358f..d75df2859 100644 --- a/src/citra_qt/game_list.cpp +++ b/src/citra_qt/game_list.cpp @@ -134,7 +134,7 @@ void GameListSearchField::setFocus() { GameListSearchField::GameListSearchField(GameList* parent) : QWidget{parent} { auto* const key_release_eater = new KeyReleaseEater(parent, this); layout_filter = new QHBoxLayout; - layout_filter->setMargin(8); + layout_filter->setContentsMargins(8, 8, 8, 8); label_filter = new QLabel; label_filter->setText(tr("Filter:")); edit_filter = new QLineEdit;