generic: remove support for final target via KDE4_ENABLE_FINAL

amarok/supplementary_scripts/neon/distros/ubuntu/cdbs/cdbs-kde/kde.mk

@@ -7,7 +7,6 @@ include /usr/share/cdbs/1/rules/utils.mk
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 DEB_CMAKE_EXTRA_FLAGS += \
 			$(DEB_CMAKE_DEBUG_FLAGS) \
-			$(KDE4-ENABLE-FINAL) \
 			-DKDE4_BUILD_TESTS=true \
 			-DKDE_DISTRIBUTION_TEXT="Kubuntu packages" \
 			-DCONFIG_INSTALL_DIR=$(DEB_CMAKE_PREFIX)/etc/kde4 \
@@ -23,17 +22,11 @@ DEB_CMAKE_EXTRA_FLAGS += \
 DEB_CMAKE_PREFIX = /opt/kde-nightly
 DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
 DEB_DH_SHLIBDEPS_ARGS = -l/usr/lib/kde4/lib/
-DEB_KDE_ENABLE_FINAL ?=
 #DEB_MAKE_ENVVARS += XDG_CONFIG_DIRS=/etc/xdg XDG_DATA_DIRS=/usr/share
 #DEB_STRIP_EXCLUDE = so
 
 ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
     cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        KDE4-ENABLE-FINAL = $(if $(DEB_KDE_ENABLE_FINAL),-DKDE4_ENABLE_FINAL=true,)
-    else
-        KDE4-ENABLE-FINAL =
-    endif
 endif
 
 ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))

gwenview/CMakeLists.txt

@@ -7,8 +7,6 @@ include(KDE4Defaults)
 include(MacroLibrary)
 include(MacroOptionalAddSubdirectory)
 
-KDE4_NO_ENABLE_FINAL(gwenview)
-
 ## Dependencies
 find_package(JPEG)
 macro_log_feature(JPEG_FOUND "libjpeg" "JPEG image manipulation support" "http://libjpeg.sourceforge.net/" TRUE)

libkscreen/tests/CMakeLists.txt

@@ -1,17 +1,13 @@
 add_definitions(-DTEST_DATA="${CMAKE_CURRENT_SOURCE_DIR}/configs/")
 
-macro(KSCREEN_TESTS)
-    foreach(_testname ${ARGN})
-        qt4_generate_moc(${_testname}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testname}.moc)
-        include_directories(${QT_INCLUDES} ${KDE4_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR} ${X11_Xrandr_INCLUDE_PATH})
-        kde4_add_unit_test(${_testname} ${_testname}.cpp ${_testname}.moc)
-        target_link_libraries(${_testname} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} kscreen)
-        add_test(${_testname} ${CMAKE_CURRENT_BINARY_DIR}/${_testname})
-    endforeach(_testname)
-endmacro(KSCREEN_TESTS)
+include_directories(${QT_INCLUDES} ${KDE4_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR} ${X11_Xrandr_INCLUDE_PATH})
 
-KSCREEN_TESTS(testscreenconfig )
+qt4_generate_moc(testscreenconfig.cpp ${CMAKE_CURRENT_BINARY_DIR}/testscreenconfig.moc)
+kde4_add_unit_test(testscreenconfig testscreenconfig.cpp)
+target_link_libraries(testscreenconfig ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} kscreen)
 
 if (ENABLE_XRANDR_TESTS)
-    KSCREEN_TESTS(testxrandr )
+    qt4_generate_moc(testxrandr.cpp ${CMAKE_CURRENT_BINARY_DIR}/testxrandr.moc)
+    kde4_add_unit_test(testxrandr testxrandr.cpp)
+    target_link_libraries(testxrandr ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} kscreen)
 endif()

thumbnailers/ps/dscparse_adapter.h

@@ -28,10 +28,8 @@
 
 #include "dscparse.h"
 
-#ifndef KDE_USE_FINAL
 #undef min
 #undef max
-#endif
 
 #if defined(__GNUC__)
 #if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 93)