renaming experimental branch

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@4675 90c681e8-e032-0410-971d-27865f9a5e38

4 files changed, 8 insertions, 26 deletions

diff --git a/src/plugins/General/hotkey/CMakeLists.txt b/src/plugins/General/hotkey/CMakeLists.txt
index 62845b042..1e489598e 100644
--- a/src/plugins/General/hotkey/CMakeLists.txt
+++ b/src/plugins/General/hotkey/CMakeLists.txt
@@ -47,21 +47,12 @@ SET(libhotkey_SRCS
     hotkeydialog.cpp
 )
 
-SET(libhotkey_MOC_HDRS
-    settingsdialog.h
-    hotkeyfactory.h
-    hotkeymanager.h
-    hotkeydialog.h
-)
-
 SET(libhotkey_RCCS
     translations/translations.qrc
 )
 
 QT4_ADD_RESOURCES(libhotkey_RCC_SRCS ${libhotkey_RCCS})
 
-QT4_WRAP_CPP(libhotkey_MOC_SRCS ${libhotkey_MOC_HDRS})
-
 # user interface
 
 
@@ -76,7 +67,7 @@ QT4_WRAP_UI(libhotkey_UIS_H ${libhotkey_UIS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(X11_FOUND)
-ADD_LIBRARY(hotkey MODULE ${libhotkey_SRCS} ${libhotkey_MOC_SRCS} ${libhotkey_UIS_H} ${libhotkey_RCC_SRCS})
+ADD_LIBRARY(hotkey MODULE ${libhotkey_SRCS} ${libhotkey_UIS_H} ${libhotkey_RCC_SRCS})
 add_dependencies(hotkey qmmpui)
 target_link_libraries(hotkey ${QT_LIBRARIES} -lqmmpui -lqmmp ${X11_LDFLAGS})
 install(TARGETS hotkey DESTINATION ${LIB_DIR}/qmmp/General)
diff --git a/src/plugins/General/hotkey/hotkey.pro b/src/plugins/General/hotkey/hotkey.pro
index e209a5e74..f166ebae1 100644
--- a/src/plugins/General/hotkey/hotkey.pro
+++ b/src/plugins/General/hotkey/hotkey.pro
@@ -12,21 +12,6 @@ TARGET = $$PLUGINS_PREFIX/General/hotkey
 TEMPLATE = lib

 QMAKE_LIBDIR += ../../../../lib

 

-TRANSLATIONS = translations/hotkey_plugin_cs.ts \

-               translations/hotkey_plugin_de.ts \

-               translations/hotkey_plugin_zh_CN.ts \

-               translations/hotkey_plugin_zh_TW.ts \

-               translations/hotkey_plugin_ru.ts \

-               translations/hotkey_plugin_pl.ts \

-               translations/hotkey_plugin_uk_UA.ts \

-               translations/hotkey_plugin_it.ts \

-               translations/hotkey_plugin_tr.ts \

-               translations/hotkey_plugin_lt.ts \

-               translations/hotkey_plugin_nl.ts \

-               translations/hotkey_plugin_ja.ts \

-               translations/hotkey_plugin_es.ts \

-               translations/hotkey_plugin_sr_BA.ts \

-               translations/hotkey_plugin_sr_RS.ts

 RESOURCES = translations/translations.qrc

 

 target.path = $$LIB_DIR/qmmp/General

diff --git a/src/plugins/General/hotkey/hotkeymanager_win.cpp b/src/plugins/General/hotkey/hotkeymanager_win.cpp
index c8d71ea9f..bf2b2165e 100644
--- a/src/plugins/General/hotkey/hotkeymanager_win.cpp
+++ b/src/plugins/General/hotkey/hotkeymanager_win.cpp
@@ -298,5 +298,8 @@ 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 21e3bdab8..b24feab84 100644
--- a/src/plugins/General/hotkey/hotkeymanager_x11.cpp
+++ b/src/plugins/General/hotkey/hotkeymanager_x11.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2009-2013 by Ilya Kotov                                 *
+ *   Copyright (C) 2009-2014 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   Copyright (C) 2003-2007 by Justin Karneges and Michail Pishchagin     *
@@ -316,4 +316,7 @@ quint32 HotkeyManager::keycodeToKeysym(quint32 keycode)
     return XKeycodeToKeysym(QX11Info::display(), keycode,0);
 #endif
 }
+
+#include "moc_hotkeymanager.cpp"
+
 #endif