From 8fbfe081b2f35cb89bbc08b3b752fa336603f183 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathias=20Panzenb=C3=B6ck?= <grosser.meister.morti@gmx.net>
Date: Sat, 23 Jan 2016 02:51:07 +0100
Subject: [PATCH] port to Qt5

---
 CMakeLists.txt     | 13 ++++++-------
 src/CMakeLists.txt |  4 ++--
 src/getkey.h       |  5 +++++
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b4f9b0..c0e10ba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.8)
+cmake_minimum_required(VERSION 2.8.11)
 
 project(qjoypad)
 
@@ -6,7 +6,9 @@ set(QJOYPAD_MAJOR 4)
 set(QJOYPAD_MINOR 2)
 set(QJOYPAD_PATCH 1)
 
-find_package(Qt4 REQUIRED)
+find_package(Qt5Widgets REQUIRED)
+find_package(Qt5LinguistTools REQUIRED)
+find_package(Qt5X11Extras REQUIRED)
 
 option(WITH_LIBUDEV "Use libudev for automatically updating joypad devices." ON)
 
@@ -44,9 +46,6 @@ endif()
 
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
 
-include(${QT_USE_FILE})
-add_definitions(${QT_DEFINITIONS})
-
 # for config.h
 include_directories("${PROJECT_BINARY_DIR}/src")
 
@@ -54,9 +53,9 @@ file(GLOB qjoypad_TRANS_SOURCES translations/qjoypad*.ts)
 
 if(UPDATE_TRANSLATIONS)
 	file(GLOB_RECURSE qjoypad_TRANS_FILES *.cpp *.h)
-	qt4_create_translation(qjoypad_TRANS ${qjoypad_TRANS_SOURCES} ${qjoypad_TRANS_FILES})
+        qt5_create_translation(qjoypad_TRANS ${qjoypad_TRANS_SOURCES} ${qjoypad_TRANS_FILES})
 else()
-	qt4_add_translation(qjoypad_TRANS ${qjoypad_TRANS_SOURCES})
+        qt5_add_translation(qjoypad_TRANS ${qjoypad_TRANS_SOURCES})
 endif()
 
 add_subdirectory(icons)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fcbde6a..0790f1a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -40,8 +40,8 @@ set(qjoypad_QOBJECT_HEADERS
 	layout.h
 	quickset.h)
 
-qt4_wrap_cpp(qjoypad_HEADERS_MOC ${qjoypad_QOBJECT_HEADERS})
+qt5_wrap_cpp(qjoypad_HEADERS_MOC ${qjoypad_QOBJECT_HEADERS})
 add_executable(qjoypad ${qjoypad_SOURCES} ${qjoypad_HEADERS_MOC})
-target_link_libraries(qjoypad ${QT_LIBRARIES} Xtst X11 ${LIBUDEV_LIBRARIES})
+target_link_libraries(qjoypad Qt5::Widgets Qt5::X11Extras Xtst X11 ${LIBUDEV_LIBRARIES})
 
 install(TARGETS qjoypad RUNTIME DESTINATION "bin")
diff --git a/src/getkey.h b/src/getkey.h
index 8b97c2d..24c5b51 100644
--- a/src/getkey.h
+++ b/src/getkey.h
@@ -7,7 +7,12 @@
 #include <QIcon>
 #include <QCloseEvent>
 #include "constant.h"
+
 #include <X11/Xlib.h>
+// undefined Xlib macros that collide with Qt types
+#undef Bool
+#undef Unsorted
+
 //The KeySym for "x"
 #define XK_x 0x078