mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-07-31 19:30:21 +02:00
Code Issues Releases Wiki Activity

Remove obsolete qt_wrap_ui macro

Browse Source
This commit is contained in:
Andreas Sturmlechner
2018-07-07 22:40:25 +02:00
committed by Dominik Schmidt
parent 57bc920534
commit a563993b71
5 changed files with 4 additions and 8 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_wrap_ui)
qt5_wrap_ui(${ARGN})
endmacro()
macro(qt_add_resources) macro(qt_add_resources)
qt5_add_resources(${ARGN}) qt5_add_resources(${ARGN})
endmacro() endmacro()

2
TomahawkAddLibrary.cmake
View File

@@ -25,7 +25,7 @@ function(tomahawk_add_library)
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})
if(LIBRARY_UI) if(LIBRARY_UI)
qt_wrap_ui(LIBRARY_UI_SOURCES ${LIBRARY_UI}) qt5_wrap_ui(LIBRARY_UI_SOURCES ${LIBRARY_UI})
list(APPEND LIBRARY_SOURCES ${LIBRARY_UI_SOURCES}) list(APPEND LIBRARY_SOURCES ${LIBRARY_UI_SOURCES})
endif() endif()

2
src/crashreporter/CMakeLists.txt
View File

@@ -8,7 +8,7 @@ setup_qt()
list(APPEND crashreporter_SOURCES main.cpp) list(APPEND crashreporter_SOURCES main.cpp)
list(APPEND crashreporter_RC resources.qrc) list(APPEND crashreporter_RC resources.qrc)
qt_wrap_ui( crashreporter_UI_HEADERS ${crashreporter_UI} ) qt5_wrap_ui( crashreporter_UI_HEADERS ${crashreporter_UI} )
qt_add_resources( crashreporter_RC_RCC ${crashreporter_RC} ) qt_add_resources( crashreporter_RC_RCC ${crashreporter_RC} )

2
src/libtomahawk/CMakeLists.txt
View File

@@ -476,7 +476,7 @@ IF(BUILD_GUI)
LIST(APPEND libSources ${libGuiSources} ) LIST(APPEND libSources ${libGuiSources} )
ENDIF() ENDIF()
qt_wrap_ui(libUI_H ${libUI}) qt5_wrap_ui(libUI_H ${libUI})
SET( libSources ${libSources} ${libUI_H} ) SET( libSources ${libSources} ${libUI_H} )

2
src/tomahawk/CMakeLists.txt
View File

@@ -141,7 +141,7 @@ SET( final_src ${final_src} ${tomahawkMoc} ${tomahawkSources} ${trans_outfile})
IF( BUILD_GUI ) IF( BUILD_GUI )
LIST(APPEND tomahawkSources ${tomahawkSourcesGui}) LIST(APPEND tomahawkSources ${tomahawkSourcesGui})
qt_wrap_ui( tomahawkUI_H ${tomahawkUI} ) qt5_wrap_ui( tomahawkUI_H ${tomahawkUI} )
ENDIF() ENDIF()
file( GLOB_RECURSE TOMAHAWK_ICONS "${CMAKE_SOURCE_DIR}/data/icons/*-tomahawk-icon.png" ) file( GLOB_RECURSE TOMAHAWK_ICONS "${CMAKE_SOURCE_DIR}/data/icons/*-tomahawk-icon.png" )