New upstream version 26.0.0+dfsg1

This commit is contained in:
Sebastian Ramacher 2020-10-01 22:15:25 +02:00
parent 8e020cdacb
commit 240080891f
837 changed files with 41275 additions and 9196 deletions

View file

@ -289,6 +289,8 @@ private:
void RecalcOutputResPixels(const char *resText);
bool AskIfCanCloseSettings();
QIcon generalIcon;
QIcon streamIcon;
QIcon outputIcon;
@ -375,7 +377,8 @@ private slots:
void SetAdvancedIcon(const QIcon &icon);
protected:
virtual void closeEvent(QCloseEvent *event);
virtual void closeEvent(QCloseEvent *event) override;
void reject() override;
public:
OBSBasicSettings(QWidget *parent);