aboutsummaryrefslogtreecommitdiff
path: root/src/app
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/app
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/app')
-rw-r--r--src/app/CMakeLists.txt13
-rw-r--r--src/app/app.pro20
2 files changed, 2 insertions, 31 deletions
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
index 6e60603dc..f95d97041 100644
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -1,6 +1,6 @@
project(app)
-cmake_minimum_required(VERSION 2.4.7)
+cmake_minimum_required(VERSION 2.8.6)
if(COMMAND cmake_policy)
cmake_policy(SET CMP0003 NEW)
@@ -38,24 +38,15 @@ SET(app_SRCS
SET(app_HDRS lxdesupport.h)
-SET(app_MOC_HDRS
- builtincommandlineoption.h
- qmmpstarter.h
- qmmpapplication.h
-)
-
SET(app_RCCS images/images.qrc translations/qmmp_locales.qrc)
QT4_ADD_RESOURCES(app_RCC_SRCS ${app_RCCS})
-QT4_AUTOMOC(${app_MOC_SRC})
-QT4_WRAP_CPP(app_MOC_SRCS ${app_MOC_HDRS})
-
# Don't forget to include output directory, otherwise
# the UI file won't be wrapped!
include_directories(${CMAKE_CURRENT_BINARY_DIR})
-ADD_EXECUTABLE(qmmp ${app_SRCS} ${app_MOC_SRCS} ${app_RCC_SRCS} ${app_HDRS})
+ADD_EXECUTABLE(qmmp ${app_SRCS} ${app_RCC_SRCS} ${app_HDRS})
target_link_libraries(qmmp ${QT_LIBRARIES} libqmmp qmmpui)
add_dependencies(qmmp qmmpui libqmmp)
install(TARGETS qmmp DESTINATION bin)
diff --git a/src/app/app.pro b/src/app/app.pro
index 08a795225..5d7691efd 100644
--- a/src/app/app.pro
+++ b/src/app/app.pro
@@ -61,23 +61,3 @@ unix {
icon_svg
}
RESOURCES += translations/qmmp_locales.qrc
-TRANSLATIONS = translations/qmmp_ru.ts \
- translations/qmmp_tr.ts \
- translations/qmmp_zh_CN.ts \
- translations/qmmp_cs.ts \
- translations/qmmp_pt_BR.ts \
- translations/qmmp_uk_UA.ts \
- translations/qmmp_zh_TW.ts \
- translations/qmmp_de.ts \
- translations/qmmp_pl_PL.ts \
- translations/qmmp_it.ts \
- translations/qmmp_lt.ts \
- translations/qmmp_hu.ts \
- translations/qmmp_nl.ts \
- translations/qmmp_ja.ts \
- translations/qmmp_es.ts \
- translations/qmmp_sk.ts \
- translations/qmmp_sr_BA.ts \
- translations/qmmp_sr_RS.ts
-
-