mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-08 15:16:34 +02:00
Code Issues Releases Wiki Activity

Remove obsolete qt_add_resources macro

Browse Source
This commit is contained in:
Andreas Sturmlechner
2018-07-07 22:41:40 +02:00
committed by Dominik Schmidt
parent a563993b71
commit 3b1e0b3cf1
4 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -186,10 +186,6 @@ if(WIN32)
find_package(Qt5WinExtras REQUIRED) find_package(Qt5WinExtras REQUIRED)
endif() endif()
macro(qt_add_resources)
qt5_add_resources(${ARGN})
endmacro()
find_package(Qt5LinguistTools REQUIRED) find_package(Qt5LinguistTools REQUIRED)
macro(qt_add_translation) macro(qt_add_translation)
qt5_add_translation(${ARGN}) qt5_add_translation(${ARGN})

2
TomahawkAddLibrary.cmake
View File

@@ -31,7 +31,7 @@ function(tomahawk_add_library)
# add resources from current dir # add resources from current dir
if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/resources.qrc") if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/resources.qrc")
qt_add_resources(LIBRARY_RC_SOURCES "resources.qrc") qt5_add_resources(LIBRARY_RC_SOURCES "resources.qrc")
list(APPEND LIBRARY_SOURCES ${LIBRARY_RC_SOURCES}) list(APPEND LIBRARY_SOURCES ${LIBRARY_RC_SOURCES})
unset(LIBRARY_RC_SOURCES) unset(LIBRARY_RC_SOURCES)
endif() endif()

2
src/crashreporter/CMakeLists.txt
View File

@@ -9,7 +9,7 @@ list(APPEND crashreporter_SOURCES main.cpp)
list(APPEND crashreporter_RC resources.qrc) list(APPEND crashreporter_RC resources.qrc)
qt5_wrap_ui( crashreporter_UI_HEADERS ${crashreporter_UI} ) qt5_wrap_ui( crashreporter_UI_HEADERS ${crashreporter_UI} )
qt_add_resources( crashreporter_RC_RCC ${crashreporter_RC} ) qt5_add_resources( crashreporter_RC_RCC ${crashreporter_RC} )
if(BUILD_RELEASE) if(BUILD_RELEASE)

2
src/tomahawk/CMakeLists.txt
View File

@@ -153,7 +153,7 @@ else()
ecm_add_app_icon(tomahawkSources ICONS ${TOMAHAWK_ICONS}) ecm_add_app_icon(tomahawkSources ICONS ${TOMAHAWK_ICONS})
endif() endif()
qt_add_resources( RC_SRCS "../../resources.qrc" ) qt5_add_resources( RC_SRCS "../../resources.qrc" )
SET( final_src ${final_src} ${tomahawkUI_H} ${tomahawkMoc} ${tomahawkSources} ${RC_SRCS} ) SET( final_src ${final_src} ${tomahawkUI_H} ${tomahawkMoc} ${tomahawkSources} ${RC_SRCS} )