From d3de8049bfa2b0c468864ec23a3d8e06c50aff4c Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Wed, 19 Aug 2020 21:47:45 -0700 Subject: [PATCH] QTBUG-80947 is fixed for real in Qt 5.15.1 --- app/backend/autoupdatechecker.cpp | 7 ++----- app/backend/nvhttp.cpp | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/app/backend/autoupdatechecker.cpp b/app/backend/autoupdatechecker.cpp index 43c13b6e..7db57334 100644 --- a/app/backend/autoupdatechecker.cpp +++ b/app/backend/autoupdatechecker.cpp @@ -29,11 +29,8 @@ AutoUpdateChecker::AutoUpdateChecker(QObject *parent) : void AutoUpdateChecker::start() { #if defined(Q_OS_WIN32) || defined(Q_OS_DARWIN) || defined(STEAM_LINK) || defined(APP_IMAGE) // Only run update checker on platforms without auto-update -#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) && !defined(QT_NO_BEARERMANAGEMENT) - // HACK: Set network accessibility to work around QTBUG-80947. - // Even though it was fixed in 5.14.2, it still breaks for users attempting to - // directly connect their computers without a router using APIPA and in some cases - // using OpenVPN with IPv6 enabled. https://github.com/moonlight-stream/moonlight-qt/issues/375 +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) && QT_VERSION < QT_VERSION_CHECK(5, 15, 1) && !defined(QT_NO_BEARERMANAGEMENT) + // HACK: Set network accessibility to work around QTBUG-80947 (introduced in Qt 5.14.0 and fixed in Qt 5.15.1) QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED m_Nam.setNetworkAccessible(QNetworkAccessManager::Accessible); diff --git a/app/backend/nvhttp.cpp b/app/backend/nvhttp.cpp index 280c7e44..d3ea30e3 100644 --- a/app/backend/nvhttp.cpp +++ b/app/backend/nvhttp.cpp @@ -444,11 +444,8 @@ NvHTTP::openConnection(QUrl baseUrl, // Add our client certificate request.setSslConfiguration(IdentityManager::get()->getSslConfig()); -#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) && !defined(QT_NO_BEARERMANAGEMENT) - // HACK: Set network accessibility to work around QTBUG-80947. - // Even though it was fixed in 5.14.2, it still breaks for users attempting to - // directly connect their computers without a router using APIPA and in some cases - // using OpenVPN with IPv6 enabled. https://github.com/moonlight-stream/moonlight-qt/issues/375 +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) && QT_VERSION < QT_VERSION_CHECK(5, 15, 1) && !defined(QT_NO_BEARERMANAGEMENT) + // HACK: Set network accessibility to work around QTBUG-80947 (introduced in Qt 5.14.0 and fixed in Qt 5.15.1) QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED m_Nam.setNetworkAccessible(QNetworkAccessManager::Accessible);