Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
commit
a5938a7de9
40 changed files with 117 additions and 54 deletions
|
@ -88,7 +88,7 @@ class NetRequest : public NetAction {
|
|||
std::unique_ptr<Sink> m_sink;
|
||||
Options m_options;
|
||||
|
||||
typedef const QLoggingCategory& (*logCatFunc)();
|
||||
using logCatFunc = const QLoggingCategory& (*)();
|
||||
logCatFunc logCat = taskUploadLogC;
|
||||
|
||||
std::chrono::steady_clock m_clock;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue