From 3af24eafbb173e60e3e66d86446b5613e61e9b98 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Sat, 30 Jan 2021 12:53:57 -0600 Subject: [PATCH] Build fixes --- app/main.cpp | 1 - app/settings/streamingpreferences.cpp | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/main.cpp b/app/main.cpp index b9174132..5bf3a1b1 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -11,7 +11,6 @@ #include #include #include -#include // Don't let SDL hook our main function, since Qt is already // doing the same thing. This needs to be before any headers diff --git a/app/settings/streamingpreferences.cpp b/app/settings/streamingpreferences.cpp index 3eafe93f..e036a1aa 100644 --- a/app/settings/streamingpreferences.cpp +++ b/app/settings/streamingpreferences.cpp @@ -3,6 +3,9 @@ #include #include #include +#include + +#include #define SER_STREAMSETTINGS "streamsettings" #define SER_WIDTH "width" @@ -162,7 +165,7 @@ bool StreamingPreferences::retranslate() m_QmlEngine->retranslate(); #else // Unreachable below Qt 5.10 due to the check above - Q_ASSERT(FALSE); + Q_ASSERT(false); #endif } else {