straight copy of qt4 branch over to trunk, merge refused to work

git-svn-id: svn://svn.code.sf.net/p/qjoypad/code/trunk@95 c05e91a0-76c8-4ec0-b377-ef19ce7cc080
2009-08-03 01:01:45 +00:00
parent c1ef3fa0b7
commit 345bb5748e
36 changed files with 1152 additions and 1506 deletions
--- a/src/buttonw.h
+++ b/src/buttonw.h
@ -7,6 +7,11 @@
 #include "button_edit.h"
 //this IS a FlashButton
 #include "flash.h"
+#ifdef Bool
+#undef Bool
+#endif
+
+#include <QMouseEvent>

 class ButtonWidget : public FlashButton {
 	public: