Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into qt6-category
Browse files Browse the repository at this point in the history
  • Loading branch information
Silarn committed Sep 21, 2023
2 parents 0c094a1 + 7050927 commit ede8aee
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
2 changes: 0 additions & 2 deletions src/createinstancedialogpages.h
Original file line number Diff line number Diff line change
Expand Up @@ -574,8 +574,6 @@ class ProfilePage : public Page
bool ready() const override;

CreateInstanceDialog::ProfileSettings profileSettings() const override;

protected:
};

// nexus connection page; this reuses the ui found in the settings dialog and
Expand Down
8 changes: 4 additions & 4 deletions src/settingsdialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -1052,8 +1052,8 @@ If you disable this feature, MO will only display official DLCs this way. Please
<rect>
<x>0</x>
<y>0</y>
<width>761</width>
<height>515</height>
<width>778</width>
<height>497</height>
</rect>
</property>
<property name="autoFillBackground">
Expand Down Expand Up @@ -1742,8 +1742,8 @@ If you disable this feature, MO will only display official DLCs this way. Please
<rect>
<x>0</x>
<y>0</y>
<width>390</width>
<height>342</height>
<width>778</width>
<height>475</height>
</rect>
</property>
<property name="autoFillBackground">
Expand Down

0 comments on commit ede8aee

Please sign in to comment.