diff --git a/UI/auth-youtube.cpp b/UI/auth-youtube.cpp index 26de43e66..3a8cc856e 100644 --- a/UI/auth-youtube.cpp +++ b/UI/auth-youtube.cpp @@ -7,9 +7,7 @@ #include #include #include -#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)) #include -#endif #ifdef WIN32 #include @@ -200,7 +198,6 @@ void YoutubeAuth::ResetChat() QString YoutubeAuth::GenerateState() { -#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)) char state[YOUTUBE_API_STATE_LENGTH + 1]; QRandomGenerator *rng = QRandomGenerator::system(); int i; @@ -210,17 +207,6 @@ QString YoutubeAuth::GenerateState() state[i] = 0; return state; -#else - std::uniform_int_distribution<> distr(0, allowedCount); - std::string result; - result.reserve(YOUTUBE_API_STATE_LENGTH); - std::generate_n(std::back_inserter(result), YOUTUBE_API_STATE_LENGTH, - [&] { - return static_cast( - allowedChars[distr(randomSeed)]); - }); - return result.c_str(); -#endif } // Static. diff --git a/UI/auth-youtube.hpp b/UI/auth-youtube.hpp index c0bd7b687..f1937dbeb 100644 --- a/UI/auth-youtube.hpp +++ b/UI/auth-youtube.hpp @@ -40,7 +40,6 @@ class YoutubeAuth : public OAuthStreamKey { Q_OBJECT bool uiLoaded = false; - std::mt19937 randomSeed; std::string section; #ifdef BROWSER_AVAILABLE diff --git a/UI/obs-proxy-style.cpp b/UI/obs-proxy-style.cpp index 9b5c4d1e2..270ab127f 100644 --- a/UI/obs-proxy-style.cpp +++ b/UI/obs-proxy-style.cpp @@ -82,10 +82,8 @@ int OBSIgnoreWheelProxyStyle::styleHint(StyleHint hint, const QWidget *widget, QStyleHintReturn *returnData) const { -#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) if (hint == SH_ComboBox_AllowWheelScrolling) return 0; -#endif return QProxyStyle::styleHint(hint, option, widget, returnData); } diff --git a/UI/properties-view.cpp b/UI/properties-view.cpp index d47270c56..9d5a7b6bf 100644 --- a/UI/properties-view.cpp +++ b/UI/properties-view.cpp @@ -269,11 +269,7 @@ QWidget *OBSPropertiesView::AddText(obs_property_t *prop, QFormLayout *layout, if (type == OBS_TEXT_MULTILINE) { QPlainTextEdit *edit = new QPlainTextEdit(QT_UTF8(val)); -#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) edit->setTabStopDistance(40); -#else - edit->setTabStopWidth(40); -#endif if (monospace) { QFont f("Courier"); f.setStyleHint(QFont::Monospace);