moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2025-07-02 07:46:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restore the full QTBUG-80947 hack as it appears to still be required sometimes

Browse Source
This commit is contained in:
Cameron Gutman 2020-05-02 10:14:54 -07:00
parent 417aa2815c
commit f28a4df5ee
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/backend/autoupdatechecker.cpp
View File

@ -29,9 +29,15 @@ AutoUpdateChecker::AutoUpdateChecker(QObject *parent) :
void AutoUpdateChecker::start() 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 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) && QT_VERSION < QT_VERSION_CHECK(5, 14, 2) && !defined(QT_NO_BEARERMANAGEMENT) #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) && !defined(QT_NO_BEARERMANAGEMENT)
// HACK: Set network accessibility to work around QTBUG-80947 // 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
QT_WARNING_PUSH
QT_WARNING_DISABLE_DEPRECATED
m_Nam.setNetworkAccessible(QNetworkAccessManager::Accessible); m_Nam.setNetworkAccessible(QNetworkAccessManager::Accessible);
QT_WARNING_POP
#endif #endif
// We'll get a callback when this is finished // We'll get a callback when this is finished

3
app/backend/nvhttp.cpp
View File

@ -443,7 +443,8 @@ NvHTTP::openConnection(QUrl baseUrl,
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) && !defined(QT_NO_BEARERMANAGEMENT) #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) && !defined(QT_NO_BEARERMANAGEMENT)
// HACK: Set network accessibility to work around QTBUG-80947. // 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 // 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. // 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
QT_WARNING_PUSH QT_WARNING_PUSH
QT_WARNING_DISABLE_DEPRECATED QT_WARNING_DISABLE_DEPRECATED
m_Nam.setNetworkAccessible(QNetworkAccessManager::Accessible); m_Nam.setNetworkAccessible(QNetworkAccessManager::Accessible);