aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Output/null
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/Output/null
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/Output/null')
-rw-r--r--src/plugins/Output/null/CMakeLists.txt9
-rw-r--r--src/plugins/Output/null/null.pro16
2 files changed, 1 insertions, 24 deletions
diff --git a/src/plugins/Output/null/CMakeLists.txt b/src/plugins/Output/null/CMakeLists.txt
index 0a251c614..8057dfbe3 100644
--- a/src/plugins/Output/null/CMakeLists.txt
+++ b/src/plugins/Output/null/CMakeLists.txt
@@ -30,10 +30,6 @@ SET(libnull_SRCS
outputnullfactory.cpp
)
-SET(libnull_MOC_HDRS
- outputnullfactory.h
-)
-
SET(libnull_HDRS
outputnull.h
)
@@ -42,15 +38,12 @@ SET(libnull_RCCS translations/translations.qrc)
QT4_ADD_RESOURCES(libnull_RCC_SRCS ${libnull_RCCS})
-QT4_WRAP_CPP(libnull_MOC_SRCS ${libnull_MOC_HDRS})
-
-
# Don't forget to include output directory, otherwise
# the UI file won't be wrapped!
include_directories(${CMAKE_CURRENT_BINARY_DIR})
-ADD_LIBRARY(null MODULE ${libnull_SRCS} ${libnull_MOC_SRCS} ${libnull_UIS_H} ${libnull_RCC_SRCS} ${libnull_HDRS})
+ADD_LIBRARY(null MODULE ${libnull_SRCS} ${libnull_UIS_H} ${libnull_RCC_SRCS} ${libnull_HDRS})
add_dependencies(null qmmp)
target_link_libraries(null ${QT_LIBRARIES} -lqmmp)
install(TARGETS null DESTINATION ${LIB_DIR}/qmmp/Output)
diff --git a/src/plugins/Output/null/null.pro b/src/plugins/Output/null/null.pro
index 6616e44ee..4d0d98601 100644
--- a/src/plugins/Output/null/null.pro
+++ b/src/plugins/Output/null/null.pro
@@ -18,22 +18,6 @@ plugin
TEMPLATE = lib
-TRANSLATIONS = translations/null_plugin_cs.ts \
- translations/null_plugin_de.ts \
- translations/null_plugin_zh_CN.ts \
- translations/null_plugin_zh_TW.ts \
- translations/null_plugin_ru.ts \
- translations/null_plugin_pl.ts \
- translations/null_plugin_uk_UA.ts \
- translations/null_plugin_it.ts \
- translations/null_plugin_tr.ts \
- translations/null_plugin_lt.ts \
- translations/null_plugin_nl.ts \
- translations/null_plugin_ja.ts \
- translations/null_plugin_es.ts \
- translations/null_plugin_sr_BA.ts \
- translations/null_plugin_sr_RS.ts
-
RESOURCES = translations/translations.qrc
unix {