aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/General/hal
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2015-01-09 12:01:22 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2015-01-09 12:01:22 +0000
commitebd7f9bc697973366de8a6bf7265051e825e0680 (patch)
tree1feb9df1c5fe3493e9aa1dd8f5d6233a38ae9d3c /src/plugins/General/hal
parentbc7ad688c646afd2a89e5c5ff58696f2df2c8605 (diff)
downloadqmmp-ebd7f9bc697973366de8a6bf7265051e825e0680.tar.gz
qmmp-ebd7f9bc697973366de8a6bf7265051e825e0680.tar.bz2
qmmp-ebd7f9bc697973366de8a6bf7265051e825e0680.zip
renaming experimental branch
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@4675 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/General/hal')
-rw-r--r--src/plugins/General/hal/CMakeLists.txt12
-rw-r--r--src/plugins/General/hal/hal.pro16
2 files changed, 1 insertions, 27 deletions
diff --git a/src/plugins/General/hal/CMakeLists.txt b/src/plugins/General/hal/CMakeLists.txt
index fe07dd690..b436fcfce 100644
--- a/src/plugins/General/hal/CMakeLists.txt
+++ b/src/plugins/General/hal/CMakeLists.txt
@@ -35,20 +35,10 @@ SET(libhal_SRCS
settingsdialog.cpp
)
-SET(libhal_MOC_HDRS
- halfactory.h
- halmanager.h
- halplugin.h
- haldevice.h
- settingsdialog.h
-)
-
SET(libhal_RCCS translations/translations.qrc)
QT4_ADD_RESOURCES(libhal_RCC_SRCS ${libhal_RCCS})
-QT4_WRAP_CPP(libhal_MOC_SRCS ${libhal_MOC_HDRS})
-
# user interface
SET(libhal_UIS
@@ -60,7 +50,7 @@ QT4_WRAP_UI(libhal_UIS_H ${libhal_UIS})
# the UI file won't be wrapped!
include_directories(${CMAKE_CURRENT_BINARY_DIR})
-ADD_LIBRARY(hal MODULE ${libhal_SRCS} ${libhal_MOC_SRCS} ${libhal_UIS_H} ${libhal_RCC_SRCS})
+ADD_LIBRARY(hal MODULE ${libhal_SRCS} ${libhal_UIS_H} ${libhal_RCC_SRCS})
add_dependencies(hal qmmpui)
target_link_libraries(hal ${QT_LIBRARIES} -lqmmpui -lqmmp)
install(TARGETS hal DESTINATION ${LIB_DIR}/qmmp/General)
diff --git a/src/plugins/General/hal/hal.pro b/src/plugins/General/hal/hal.pro
index 434898891..0ba95a02b 100644
--- a/src/plugins/General/hal/hal.pro
+++ b/src/plugins/General/hal/hal.pro
@@ -11,22 +11,6 @@ QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libhal.so
TEMPLATE = lib
QMAKE_LIBDIR += ../../../../lib
-TRANSLATIONS = translations/hal_plugin_cs.ts \
- translations/hal_plugin_de.ts \
- translations/hal_plugin_zh_CN.ts \
- translations/hal_plugin_zh_TW.ts \
- translations/hal_plugin_ru.ts \
- translations/hal_plugin_pl.ts \
- translations/hal_plugin_uk_UA.ts \
- translations/hal_plugin_it.ts \
- translations/hal_plugin_tr.ts \
- translations/hal_plugin_lt.ts \
- translations/hal_plugin_nl.ts \
- translations/hal_plugin_ja.ts \
- translations/hal_plugin_es.ts \
- translations/hal_plugin_sr_BA.ts \
- translations/hal_plugin_sr_RS.ts
-
RESOURCES = translations/translations.qrc
isEmpty(LIB_DIR){