ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added to fix Qt build issue with pre Qt 5.12 builds.

This commit is contained in:
mjbudd77 2021-03-21 08:34:08 -04:00
parent 451b0f8474
commit b825454fee
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/boards/28.cpp
View File

@ -53,8 +53,8 @@ void Mirror(uint8 value)
static void Sync() static void Sync()
{ {
int prglo; int prglo = 0;
int prghi; int prghi = 0;
int outb = outer << 1; int outb = outer << 1;
//this can probably be rolled up, but i have no motivation to do so //this can probably be rolled up, but i have no motivation to do so

2
src/drivers/Qt/ConsoleWindow.cpp
View File

@ -444,7 +444,7 @@ void consoleWin_t::setViewerCursor( Qt::CursorShape s )
Qt::CursorShape consoleWin_t::getViewerCursor(void) Qt::CursorShape consoleWin_t::getViewerCursor(void)
{ {
Qt::CursorShape s; Qt::CursorShape s = Qt::ArrowCursor;
if ( viewport_GL ) if ( viewport_GL )
{ {

2
src/drivers/Qt/GuiConf.cpp
View File

@ -727,9 +727,11 @@ static const char *getRoleText( QPalette::ColorRole role )
case QPalette::ToolTipText: case QPalette::ToolTipText:
rTxt = "ToolTipText"; rTxt = "ToolTipText";
break; break;
#if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
case QPalette::PlaceholderText: case QPalette::PlaceholderText:
rTxt = "PlaceholderText"; rTxt = "PlaceholderText";
break; break;
#endif
case QPalette::Text: case QPalette::Text:
rTxt = "Text"; rTxt = "Text";
break; break;