Merge remote-tracking branch 'upstream/staging' into chore/add-compiler-warnings

2023-08-10 20:38:32 +02:00
parent 81bc9e488f 2090f958c8
commit ef6f9487f4
97 changed files with 2445 additions and 1611 deletions
--- a/launcher/screenshots/ImgurAlbumCreation.h
+++ b/launcher/screenshots/ImgurAlbumCreation.h
@ -57,6 +57,8 @@ public:
        return m_id;
    }

+    void init() override {};
+
 protected
 slots:
    void downloadProgress(qint64 bytesReceived, qint64 bytesTotal) override;
--- a/launcher/screenshots/ImgurUpload.h
+++ b/launcher/screenshots/ImgurUpload.h
@ -46,6 +46,7 @@ public:
    static Ptr make(ScreenShot::Ptr shot) {
        return Ptr(new ImgurUpload(shot));
    }
+    void init() override {};

 protected
 slots: