From a563993b710054e03c45a5ac3e422b7a5ed18d57 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sat, 7 Jul 2018 22:40:25 +0200 Subject: [PATCH] Remove obsolete qt_wrap_ui macro --- CMakeLists.txt | 4 ---- TomahawkAddLibrary.cmake | 2 +- src/crashreporter/CMakeLists.txt | 2 +- src/libtomahawk/CMakeLists.txt | 2 +- src/tomahawk/CMakeLists.txt | 2 +- 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 555c7258a..68f360b10 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -186,10 +186,6 @@ if(WIN32) find_package(Qt5WinExtras REQUIRED) endif() -macro(qt_wrap_ui) - qt5_wrap_ui(${ARGN}) -endmacro() - macro(qt_add_resources) qt5_add_resources(${ARGN}) endmacro() diff --git a/TomahawkAddLibrary.cmake b/TomahawkAddLibrary.cmake index 83ab365a0..59d1bac20 100644 --- a/TomahawkAddLibrary.cmake +++ b/TomahawkAddLibrary.cmake @@ -25,7 +25,7 @@ function(tomahawk_add_library) include_directories(${CMAKE_CURRENT_BINARY_DIR}) 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}) endif() diff --git a/src/crashreporter/CMakeLists.txt b/src/crashreporter/CMakeLists.txt index bccbcfc36..296083b0a 100644 --- a/src/crashreporter/CMakeLists.txt +++ b/src/crashreporter/CMakeLists.txt @@ -8,7 +8,7 @@ setup_qt() list(APPEND crashreporter_SOURCES main.cpp) 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} ) diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt index b73adf79c..976d7b61a 100644 --- a/src/libtomahawk/CMakeLists.txt +++ b/src/libtomahawk/CMakeLists.txt @@ -476,7 +476,7 @@ IF(BUILD_GUI) LIST(APPEND libSources ${libGuiSources} ) ENDIF() -qt_wrap_ui(libUI_H ${libUI}) +qt5_wrap_ui(libUI_H ${libUI}) SET( libSources ${libSources} ${libUI_H} ) diff --git a/src/tomahawk/CMakeLists.txt b/src/tomahawk/CMakeLists.txt index f112b859e..4cef2417e 100644 --- a/src/tomahawk/CMakeLists.txt +++ b/src/tomahawk/CMakeLists.txt @@ -141,7 +141,7 @@ SET( final_src ${final_src} ${tomahawkMoc} ${tomahawkSources} ${trans_outfile}) IF( BUILD_GUI ) LIST(APPEND tomahawkSources ${tomahawkSourcesGui}) - qt_wrap_ui( tomahawkUI_H ${tomahawkUI} ) + qt5_wrap_ui( tomahawkUI_H ${tomahawkUI} ) ENDIF() file( GLOB_RECURSE TOMAHAWK_ICONS "${CMAKE_SOURCE_DIR}/data/icons/*-tomahawk-icon.png" )