diff options
| author | 2021-01-13 10:44:21 -0800 | |
|---|---|---|
| committer | 2021-01-13 10:44:21 -0800 | |
| commit | 2c2ef9252fc14363a73e12c396a28c50a55c777e (patch) | |
| tree | cbed475384a104ecb7b38044b1c81b17077da712 /src | |
| parent | Merge pull request #5341 from ReinUsesLisp/anv-storage (diff) | |
| parent | yuzu: Migrate off of setMargin() to setContentsMargins() (diff) | |
| download | yuzu-2c2ef9252fc14363a73e12c396a28c50a55c777e.tar.gz yuzu-2c2ef9252fc14363a73e12c396a28c50a55c777e.tar.xz yuzu-2c2ef9252fc14363a73e12c396a28c50a55c777e.zip | |
Merge pull request #5342 from lioncash/qt6
yuzu: Migrate off of setMargin() to setContentsMargins()
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/bootmanager.cpp | 4 | ||||
| -rw-r--r-- | src/yuzu/game_list.cpp | 2 |
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() { | |||
| 119 | GameListSearchField::GameListSearchField(GameList* parent) : QWidget{parent} { | 119 | GameListSearchField::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; |