frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into mediafoundation

Browse Source
This commit is contained in:
LordGrey
2021-02-20 18:08:24 +01:00
committed by GitHub
parent 477283f36c 9e281b2347
commit 38e133171f
3 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/hyperion/SettingsManager.h
View File

@@ -42,7 +42,7 @@ public:
/// @brief get the full settings object of this instance (with global settings)
/// @return The requested json
///
const QJsonObject & getSettings() const { return _qconfig; }
QJsonObject getSettings() const;
signals:
///