From 653d38ab915a9b1785ca71c73b32594e389ca67f Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Tue, 26 Jun 2018 14:39:03 +0000 Subject: reverted r8041 git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8062 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/General/hotkey/CMakeLists.txt | 1 + src/plugins/General/hotkey/hotkeymanager_win.cpp | 3 +++ src/plugins/General/hotkey/hotkeymanager_x11.cpp | 2 ++ 3 files changed, 6 insertions(+) (limited to 'src') diff --git a/src/plugins/General/hotkey/CMakeLists.txt b/src/plugins/General/hotkey/CMakeLists.txt index 4b1a96a34..99651e4a1 100644 --- a/src/plugins/General/hotkey/CMakeLists.txt +++ b/src/plugins/General/hotkey/CMakeLists.txt @@ -47,6 +47,7 @@ QT5_WRAP_UI(libhotkey_UIS_H ${libhotkey_UIS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(X11_FOUND) +set_property(SOURCE hotkeymanager_x11.cpp PROPERTY SKIP_AUTOMOC ON) ADD_LIBRARY(hotkey MODULE ${libhotkey_SRCS} ${libhotkey_UIS_H} ${libhotkey_RCC_SRCS}) add_dependencies(hotkey qmmpui) target_link_libraries(hotkey Qt5::Widgets Qt5::X11Extras -lqmmpui -lqmmp ${X11_LDFLAGS}) diff --git a/src/plugins/General/hotkey/hotkeymanager_win.cpp b/src/plugins/General/hotkey/hotkeymanager_win.cpp index 498230754..44fdb6cb6 100644 --- a/src/plugins/General/hotkey/hotkeymanager_win.cpp +++ b/src/plugins/General/hotkey/hotkeymanager_win.cpp @@ -298,4 +298,7 @@ quint32 HotkeyManager::keycodeToKeysym(quint32 keycode) return MapVirtualKey(keycode, 1); } +#include "moc_hotkeymanager.cpp" + #endif + diff --git a/src/plugins/General/hotkey/hotkeymanager_x11.cpp b/src/plugins/General/hotkey/hotkeymanager_x11.cpp index 4fe859674..2ac7f3a1a 100644 --- a/src/plugins/General/hotkey/hotkeymanager_x11.cpp +++ b/src/plugins/General/hotkey/hotkeymanager_x11.cpp @@ -322,4 +322,6 @@ quint32 HotkeyManager::keycodeToKeysym(quint32 keycode) #endif } +#include "moc_hotkeymanager.cpp" + #endif -- cgit v1.2.3-13-gbd6f