storm/thunderpad
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

port to Qt5

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.8) cmake_minimum_required(VERSION 2.8.11)
project(qjoypad) project(qjoypad)
@ -6,7 +6,9 @@ set(QJOYPAD_MAJOR 4)
set(QJOYPAD_MINOR 2) set(QJOYPAD_MINOR 2)
set(QJOYPAD_PATCH 1) 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) 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") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
include(${QT_USE_FILE})
add_definitions(${QT_DEFINITIONS})
# for config.h # for config.h
include_directories("${PROJECT_BINARY_DIR}/src") include_directories("${PROJECT_BINARY_DIR}/src")
@ -54,9 +53,9 @@ file(GLOB qjoypad_TRANS_SOURCES translations/qjoypad*.ts)
if(UPDATE_TRANSLATIONS) if(UPDATE_TRANSLATIONS)
file(GLOB_RECURSE qjoypad_TRANS_FILES *.cpp *.h) 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() else()
qt4_add_translation(qjoypad_TRANS ${qjoypad_TRANS_SOURCES}) qt5_add_translation(qjoypad_TRANS ${qjoypad_TRANS_SOURCES})
endif() endif()
add_subdirectory(icons) add_subdirectory(icons)

4
src/CMakeLists.txt
View File

@ -40,8 +40,8 @@ set(qjoypad_QOBJECT_HEADERS
layout.h layout.h
quickset.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}) 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") install(TARGETS qjoypad RUNTIME DESTINATION "bin")

5
src/getkey.h
View File

@ -7,7 +7,12 @@
#include <QIcon> #include <QIcon>
#include <QCloseEvent> #include <QCloseEvent>
#include "constant.h" #include "constant.h"
#include <X11/Xlib.h> #include <X11/Xlib.h>
// undefined Xlib macros that collide with Qt types
#undef Bool
#undef Unsorted
//The KeySym for "x" //The KeySym for "x"
#define XK_x 0x078 #define XK_x 0x078