Просмотр исходного кода

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.
Lioncash 5 лет назад
Родитель
Сommit
0d7de7c2db
2 измененных файлов с 3 добавлено и 3 удалено
  1. 2 2
      src/yuzu/bootmanager.cpp
  2. 1 1
      src/yuzu/game_list.cpp

+ 2 - 2
src/yuzu/bootmanager.cpp

@@ -290,8 +290,8 @@ GRenderWindow::GRenderWindow(GMainWindow* parent, EmuThread* emu_thread_,
                             QString::fromUtf8(Common::g_scm_branch),
                             QString::fromUtf8(Common::g_scm_branch),
                             QString::fromUtf8(Common::g_scm_desc)));
                             QString::fromUtf8(Common::g_scm_desc)));
     setAttribute(Qt::WA_AcceptTouchEvents);
     setAttribute(Qt::WA_AcceptTouchEvents);
-    auto layout = new QHBoxLayout(this);
-    layout->setMargin(0);
+    auto* layout = new QHBoxLayout(this);
+    layout->setContentsMargins(0, 0, 0, 0);
     setLayout(layout);
     setLayout(layout);
     input_subsystem->Initialize();
     input_subsystem->Initialize();
 
 

+ 1 - 1
src/yuzu/game_list.cpp

@@ -119,7 +119,7 @@ void GameListSearchField::setFocus() {
 GameListSearchField::GameListSearchField(GameList* parent) : QWidget{parent} {
 GameListSearchField::GameListSearchField(GameList* parent) : QWidget{parent} {
     auto* const key_release_eater = new KeyReleaseEater(parent, this);
     auto* const key_release_eater = new KeyReleaseEater(parent, this);
     layout_filter = new QHBoxLayout;
     layout_filter = new QHBoxLayout;
-    layout_filter->setMargin(8);
+    layout_filter->setContentsMargins(8, 8, 8, 8);
     label_filter = new QLabel;
     label_filter = new QLabel;
     label_filter->setText(tr("Filter:"));
     label_filter->setText(tr("Filter:"));
     edit_filter = new QLineEdit;
     edit_filter = new QLineEdit;