Skip to content

Commit 92990a4

Browse files
committed
Missed fixes for beta 3
1 parent 92b0053 commit 92990a4

File tree

2 files changed

+1
-13
lines changed

2 files changed

+1
-13
lines changed

CMake/ScmRevGen.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ if(GIT_FOUND)
77
OUTPUT_VARIABLE DOLPHIN_WC_REVISION
88
OUTPUT_STRIP_TRAILING_WHITESPACE)
99
# defines DOLPHIN_WC_DESCRIBE
10-
execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} describe --always --long --dirty
10+
execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND ${GIT_EXECUTABLE} describe --always --long # --dirty # removed from here while we're using a patch for SDL; will likely be fixed in the future
1111
OUTPUT_VARIABLE DOLPHIN_WC_DESCRIBE
1212
OUTPUT_STRIP_TRAILING_WHITESPACE)
1313

Source/Core/DolphinQt/ProjectPlus/UpdateDialog.cpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ UpdateDialog::UpdateDialog(QWidget *parent, QJsonObject jsonObject, bool forced)
4848
textEdit->setText(jsonObject.value(QStringLiteral("body")).toString());
4949
#elif defined(_WIN32)
5050
textEdit->setText(jsonObject.value(QStringLiteral("body")).toString());
51-
#elif defined(__linux__)
52-
textEdit->setText(jsonObject.value(QStringLiteral("body")).toString());
5351
#else
5452
textEdit->setText(QStringLiteral("Auto Updater is not supported on your platform."));
5553
#endif
@@ -108,16 +106,6 @@ void UpdateDialog::accept()
108106
break;
109107
}
110108

111-
#endif
112-
#ifdef __linux__
113-
if (filenameBlob.contains(QStringLiteral("Windows")) ||
114-
filenameBlob.contains(QStringLiteral("AppImage")))
115-
{
116-
filenameToDownload = filenameBlob;
117-
urlToDownload = downloadUrl;
118-
break;
119-
}
120-
121109
#endif
122110
}
123111

0 commit comments

Comments
 (0)