Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into fix_retry_dialog

launcher/ui/widgets/JavaSettingsWidget.h

@@ -25,7 +25,7 @@ class JavaSettingsWidget : public QWidget {
 
    public:
     explicit JavaSettingsWidget(QWidget* parent);
-    virtual ~JavaSettingsWidget(){};
+    virtual ~JavaSettingsWidget() {};
 
     enum class JavaStatus { NotSet, Pending, Good, DoesNotExist, DoesNotStart, ReturnedInvalidData } javaStatus = JavaStatus::NotSet;
 

launcher/ui/widgets/LanguageSelectionWidget.h

@@ -27,7 +27,7 @@ class LanguageSelectionWidget : public QWidget {
     Q_OBJECT
    public:
     explicit LanguageSelectionWidget(QWidget* parent = 0);
-    virtual ~LanguageSelectionWidget(){};
+    virtual ~LanguageSelectionWidget() {};
 
     QString getSelectedLanguageKey() const;
     void retranslate();

launcher/ui/widgets/PageContainer.h

@@ -36,6 +36,7 @@
 
 #pragma once
 
+#include <QListView>
 #include <QModelIndex>
 #include <QWidget>
 
@@ -86,6 +87,8 @@ class PageContainer : public QWidget, public BasePageContainer {
 
     void changeEvent(QEvent*) override;
 
+    void hidePageList() { m_pageList->hide(); }
+
    private:
     void createUI();
     void retranslate();