Merge pull request #8369 from CozmoP/master

MSVC2017 Qt buildfix
This commit is contained in:
Twinaphex 2019-02-25 20:51:14 +01:00 committed by GitHub
commit 37f536a915
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions

View File

@ -69,7 +69,9 @@ extern "C" {
#include "../../../config.def.h"
#include "../../../tasks/task_content.h"
#include "../../../tasks/tasks_internal.h"
#ifdef HAVE_GIT_VERSION
#include "../../../version_git.h"
#endif
#include <string/stdstring.h>
#include <encodings/utf.h>
#include <file/file_path.h>
@ -3016,7 +3018,9 @@ void MainWindow::showAbout()
QString text = QString("RetroArch ") + PACKAGE_VERSION +
"<br><br>" + "<a href=\"http://www.libretro.com/\">www.libretro.com</a>"
"<br><br>" + "<a href=\"http://www.retroarch.com/\">www.retroarch.com</a>"
#ifdef HAVE_GIT_VERSION
"<br><br>" + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_GIT_VERSION) + ": " + retroarch_git_version +
#endif
"<br>" + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_BUILD_DATE) + ": " + __DATE__;
QLabel *label = new QLabel(text, dialog.data());
QPixmap pix = getInvader();