summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Lioncash2021-01-13 07:20:20 -0500
committerGravatar Lioncash2021-01-13 07:29:59 -0500
commit0d7de7c2db27a3763ae3c2654928a3afc90e0b2b (patch)
tree3c0c193979733579dc2de046282b9d635ea0011f /src
parentMerge pull request #5333 from lioncash/define (diff)
downloadyuzu-0d7de7c2db27a3763ae3c2654928a3afc90e0b2b.tar.gz
yuzu-0d7de7c2db27a3763ae3c2654928a3afc90e0b2b.tar.xz
yuzu-0d7de7c2db27a3763ae3c2654928a3afc90e0b2b.zip
yuzu: 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.
Diffstat (limited to 'src')
-rw-r--r--src/yuzu/bootmanager.cpp4
-rw-r--r--src/yuzu/game_list.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp
index 85ee2577d..e6c8f18af 100644
--- a/src/yuzu/bootmanager.cpp
+++ b/src/yuzu/bootmanager.cpp
@@ -290,8 +290,8 @@ GRenderWindow::GRenderWindow(GMainWindow* parent, EmuThread* emu_thread_,
290 QString::fromUtf8(Common::g_scm_branch), 290 QString::fromUtf8(Common::g_scm_branch),
291 QString::fromUtf8(Common::g_scm_desc))); 291 QString::fromUtf8(Common::g_scm_desc)));
292 setAttribute(Qt::WA_AcceptTouchEvents); 292 setAttribute(Qt::WA_AcceptTouchEvents);
293 auto layout = new QHBoxLayout(this); 293 auto* layout = new QHBoxLayout(this);
294 layout->setMargin(0); 294 layout->setContentsMargins(0, 0, 0, 0);
295 setLayout(layout); 295 setLayout(layout);
296 input_subsystem->Initialize(); 296 input_subsystem->Initialize();
297 297
diff --git a/src/yuzu/game_list.cpp b/src/yuzu/game_list.cpp
index 70d865112..37b0d1a0e 100644
--- a/src/yuzu/game_list.cpp
+++ b/src/yuzu/game_list.cpp
@@ -119,7 +119,7 @@ void GameListSearchField::setFocus() {
119GameListSearchField::GameListSearchField(GameList* parent) : QWidget{parent} { 119GameListSearchField::GameListSearchField(GameList* parent) : QWidget{parent} {
120 auto* const key_release_eater = new KeyReleaseEater(parent, this); 120 auto* const key_release_eater = new KeyReleaseEater(parent, this);
121 layout_filter = new QHBoxLayout; 121 layout_filter = new QHBoxLayout;
122 layout_filter->setMargin(8); 122 layout_filter->setContentsMargins(8, 8, 8, 8);
123 label_filter = new QLabel; 123 label_filter = new QLabel;
124 label_filter->setText(tr("Filter:")); 124 label_filter->setText(tr("Filter:"));
125 edit_filter = new QLineEdit; 125 edit_filter = new QLineEdit;