Compare commits

...
4 Commits
9 changed files with 24 additions and 16 deletions
+1 -1
View File
@@ -6,7 +6,7 @@
url = https://github.com/cgutman/qmdnsengine.git url = https://github.com/cgutman/qmdnsengine.git
[submodule "app/SDL_GameControllerDB"] [submodule "app/SDL_GameControllerDB"]
path = app/SDL_GameControllerDB path = app/SDL_GameControllerDB
url = https://github.com/gabomdq/SDL_GameControllerDB.git url = https://github.com/gabomdq/gamecontrollerdb.git
[submodule "soundio/libsoundio"] [submodule "soundio/libsoundio"]
path = soundio/libsoundio path = soundio/libsoundio
url = https://github.com/andrewrk/libsoundio.git url = https://github.com/andrewrk/libsoundio.git
+3
View File
@@ -29,6 +29,9 @@ AutoUpdateChecker::AutoUpdateChecker(QObject *parent) :
void AutoUpdateChecker::start() void AutoUpdateChecker::start()
{ {
#if defined(Q_OS_WIN32) || defined(Q_OS_DARWIN) || defined(STEAM_LINK) // Only run update checker on platforms without auto-update #if defined(Q_OS_WIN32) || defined(Q_OS_DARWIN) || defined(STEAM_LINK) // Only run update checker on platforms without auto-update
// HACK: Set network accessibility to work around QTBUG-80947
m_Nam.setNetworkAccessible(QNetworkAccessManager::Accessible);
// We'll get a callback when this is finished // We'll get a callback when this is finished
QUrl url("https://moonlight-stream.org/updates/qt.json"); QUrl url("https://moonlight-stream.org/updates/qt.json");
m_Nam.get(QNetworkRequest(url)); m_Nam.get(QNetworkRequest(url));
+3
View File
@@ -454,6 +454,9 @@ NvHTTP::openConnection(QUrl baseUrl,
// Add our client certificate // Add our client certificate
request.setSslConfiguration(IdentityManager::get()->getSslConfig()); request.setSslConfiguration(IdentityManager::get()->getSslConfig());
// HACK: Set reachability to work around QTBUG-80947
m_Nam.setNetworkAccessible(QNetworkAccessManager::Accessible);
QNetworkReply* reply = m_Nam.get(request); QNetworkReply* reply = m_Nam.get(request);
// Run the request with a timeout if requested // Run the request with a timeout if requested
+1 -1
View File
@@ -1 +1 @@
1.2.0 1.2.1
@@ -1,2 +1,2 @@
#define SDL_REVISION "hg-12952:bc90ce38f1e2" #define SDL_REVISION "hg-0:aaaaaaaaaaah"
#define SDL_REVISION_NUMBER 12952 #define SDL_REVISION_NUMBER 0
@@ -3,7 +3,7 @@
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>BuildMachineOSBuild</key> <key>BuildMachineOSBuild</key>
<string>18D109</string> <string>19C57</string>
<key>CFBundleDevelopmentRegion</key> <key>CFBundleDevelopmentRegion</key>
<string>English</string> <string>English</string>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
@@ -31,16 +31,18 @@
<key>DTCompiler</key> <key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string> <string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key> <key>DTPlatformBuild</key>
<string>10E1001</string> <string>11C29</string>
<key>DTPlatformVersion</key> <key>DTPlatformVersion</key>
<string>GM</string> <string>GM</string>
<key>DTSDKBuild</key> <key>DTSDKBuild</key>
<string>18E219</string> <string>19B90</string>
<key>DTSDKName</key> <key>DTSDKName</key>
<string>macosx10.14</string> <string>macosx10.15</string>
<key>DTXcode</key> <key>DTXcode</key>
<string>1020</string> <string>1130</string>
<key>DTXcodeBuild</key> <key>DTXcodeBuild</key>
<string>10E1001</string> <string>11C29</string>
<key>LSMinimumSystemVersion</key>
<string>10.6</string>
</dict> </dict>
</plist> </plist>
Binary file not shown.
@@ -6,7 +6,7 @@
<dict> <dict>
<key>Resources/Info.plist</key> <key>Resources/Info.plist</key>
<data> <data>
K7JUofWxGZV+MoLec+znWL//Eew= nzMlFqHUY3IJN9+5hi+rcCmrPwc=
</data> </data>
</dict> </dict>
<key>files2</key> <key>files2</key>
@@ -488,11 +488,11 @@
<dict> <dict>
<key>hash</key> <key>hash</key>
<data> <data>
PGSSQVK3jtbqU9+3bHhpAtBlYWQ= ixjPDg2DQUEDn7ID2l4wMHDUvDk=
</data> </data>
<key>hash2</key> <key>hash2</key>
<data> <data>
UiWA4q+Hw/4HJRqxv5vK3LvqWFrJc5FnShxo2QJH+Iw= LUUZKxelLmuZXjHwFWFSYH8HA96Px1JVmtuv79n+gYY=
</data> </data>
</dict> </dict>
<key>Headers/SDL_rwops.h</key> <key>Headers/SDL_rwops.h</key>
@@ -686,11 +686,11 @@
<dict> <dict>
<key>hash</key> <key>hash</key>
<data> <data>
K7JUofWxGZV+MoLec+znWL//Eew= nzMlFqHUY3IJN9+5hi+rcCmrPwc=
</data> </data>
<key>hash2</key> <key>hash2</key>
<data> <data>
0/+jwfcLCE7Vwm3+K0aEsipIl7s+bTZ+XXPfcim1dEs= wTSaIBHjIt6UVPXUvR5uQkg2HsA1aWSoDz1rSMDoA4I=
</data> </data>
</dict> </dict>
</dict> </dict>