From 62fa860da4ec347ef6719d91a9a7fddbc6a07c67 Mon Sep 17 00:00:00 2001 From: "wrenczes@gmail.com" Date: Sat, 18 Dec 2010 05:55:03 +0000 Subject: [PATCH] Split out a different keybindings string if QT_CONFIG is defined. This should prevent key collisions between the different Win32 builds. --- projects/mtg/src/GameOptions.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/projects/mtg/src/GameOptions.cpp b/projects/mtg/src/GameOptions.cpp index c715a5c90..c1c6dd256 100644 --- a/projects/mtg/src/GameOptions.cpp +++ b/projects/mtg/src/GameOptions.cpp @@ -32,6 +32,9 @@ const string Options::optionNames[] = { "transitions", "bgStyle", "interruptSeconds", +#if defined(QT_CONFIG) + "keybindings_qt", +#else #if defined(WIN32) "keybindings_win", #else @@ -40,6 +43,7 @@ const string Options::optionNames[] = { #else "keybindings_psp", #endif +#endif #endif "aidecks", "interruptMySpells",