From 314c595304e7b95963356d09c7a622d5469dc6f2 Mon Sep 17 00:00:00 2001 From: Shamus Hammons Date: Fri, 10 Oct 2014 07:35:21 -0500 Subject: [PATCH] And then there was 2.1.2. :-P --- Makefile | 9 +++++---- docs/WHATSNEW | 3 ++- src/gui/about.cpp | 2 +- src/gui/mainwin.cpp | 6 +++++- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index eabcac9..1eb5e43 100644 --- a/Makefile +++ b/Makefile @@ -53,10 +53,11 @@ obj: prepare: obj @echo -e "\033[01;33m***\033[00;32m Preparing to compile Virtual Jaguar...\033[00m" -# @echo "#define VJ_RELEASE_VERSION \"v2.1.2\"" > src/version.h -# @echo "#define VJ_RELEASE_SUBVERSION \"Final\"" >> src/version.h - @echo "#define VJ_RELEASE_VERSION \"GIT `git log -1 --pretty=format:%ci | cut -d ' ' -f 1 | tr -d -`\"" > src/version.h - @echo "#define VJ_RELEASE_SUBVERSION \"2.1.2 Prerelease\"" >> src/version.h + @echo "#define VJ_RELEASE_VERSION \"v2.1.2\"" > src/version.h + @echo "#define VJ_RELEASE_SUBVERSION \"Final\"" >> src/version.h + @echo "#define VJ_REMOVE_DEV_CODE" >> src/version.h +# @echo "#define VJ_RELEASE_VERSION \"GIT `git log -1 --pretty=format:%ci | cut -d ' ' -f 1 | tr -d -`\"" > src/version.h +# @echo "#define VJ_RELEASE_SUBVERSION \"2.1.2 Prerelease\"" >> src/version.h virtualjaguar: sources libs makefile-qt @echo -e "\033[01;33m***\033[00;32m Making Virtual Jaguar GUI...\033[00m" diff --git a/docs/WHATSNEW b/docs/WHATSNEW index 45a48ff..cfbbafd 100644 --- a/docs/WHATSNEW +++ b/docs/WHATSNEW @@ -1,7 +1,8 @@ Virtual Jaguar v2.1.2 GCC/Qt ---------------------------- -* Nothing yet ;-) +* Bugfix for catastrophic failure in Controller config dialog. Thanks to ggn for + reporting this! [Shamus] Virtual Jaguar v2.1.1 GCC/Qt diff --git a/src/gui/about.cpp b/src/gui/about.cpp index 0901b0f..1b3df54 100644 --- a/src/gui/about.cpp +++ b/src/gui/about.cpp @@ -37,7 +37,7 @@ AboutWindow::AboutWindow(QWidget * parent/*= 0*/): QWidget(parent, Qt::Dialog) VJ_RELEASE_VERSION " (" VJ_RELEASE_SUBVERSION ")" "" "Coders: James Hammons (shamus)
Niels Wagenaar (nwagenaar)
Carwin Jones (Caz)
Adam Green" - "Testers: Cyrano Jones, LinkoVitch, partycle, neo-rg,
Robert R, TheUMan, Dissection, overridex,
geormetal" + "Testers: Cyrano Jones, LinkoVitch, partycle, ggn,
neo-rg, Robert R, TheUMan, Dissection,
overridex, geormetal" "Build Team: shamus (win32)
goldenegg (MacOS)" "Homepage: http://icculus.org/virtualjaguar/" "" diff --git a/src/gui/mainwin.cpp b/src/gui/mainwin.cpp index cc5dab1..e8ebb63 100644 --- a/src/gui/mainwin.cpp +++ b/src/gui/mainwin.cpp @@ -454,13 +454,14 @@ void MainWin::closeEvent(QCloseEvent * event) void MainWin::keyPressEvent(QKeyEvent * e) { +#ifndef VJ_REMOVE_DEV_CODE // From jaguar.cpp extern bool startM68KTracing; // From joystick.cpp extern int blit_start_log; // From blitter.cpp extern bool startConciseBlitLogging; - +#endif // We ignore the Alt key for now, since it causes problems with the GUI if (e->key() == Qt::Key_Alt) @@ -468,6 +469,8 @@ void MainWin::keyPressEvent(QKeyEvent * e) e->accept(); return; } +// Bar this shite from release versions kthxbai +#ifndef VJ_REMOVE_DEV_CODE else if (e->key() == Qt::Key_F11) { startM68KTracing = true; @@ -486,6 +489,7 @@ void MainWin::keyPressEvent(QKeyEvent * e) e->accept(); return; } +#endif else if (e->key() == Qt::Key_F8) { // ggn: For extra NYAN pleasure... -- 2.37.2