port to Qt5

This commit is contained in:
Mathias Panzenböck
2016-01-23 02:51:07 +01:00
parent f9816ca721
commit 8fbfe081b2
3 changed files with 13 additions and 9 deletions

View File

@ -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")

View File

@ -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