Git commit bd32e2c18b029667092f4eeb25504d5e3ade87b4 by David Faure. Committed on 15/05/2012 at 14:39. Pushed by dfaure into branch 'frameworks'.
Fix qt4 build. No idea why this line was in "qt5 only", it's not related to Qt... CCMAIL: kde-frameworks-devel@kde.org Dakon rocks, BTW. M +1 -9 tier2/kconfig/autotests/kconfig_compiler/CMakeLists.txt http://commits.kde.org/kdelibs/bd32e2c18b029667092f4eeb25504d5e3ade87b4 diff --git a/tier2/kconfig/autotests/kconfig_compiler/CMakeLists.txt b/tier2/kconfig/autotests/kconfig_compiler/CMakeLists.txt index ef06585..807088e 100644 --- a/tier2/kconfig/autotests/kconfig_compiler/CMakeLists.txt +++ b/tier2/kconfig/autotests/kconfig_compiler/CMakeLists.txt @@ -15,9 +15,7 @@ macro(GEN_KCFG_TEST_SOURCE _testName _srcs) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp PROPERTIES SKIP_AUTOMOC TRUE) set( ${_srcs} ${${_srcs}} ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h ) - if(QT5_BUILD) - macro_add_file_dependencies(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.moc ) - endif() + macro_add_file_dependencies(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.moc ) endmacro(GEN_KCFG_TEST_SOURCE) ########### next target ############### @@ -181,20 +179,14 @@ target_link_libraries(test_dpointer ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} kco ########### next target ############### set(test_signal_SRCS test_signal_main.cpp ) - - gen_kcfg_test_source(test_signal test_signal_SRCS) - add_executable(test_signal ${test_signal_SRCS}) - target_link_libraries(test_signal ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} kconfigcore kconfiggui) - ########### next target ############### set(kconfigcompiler_test_SRCS kconfigcompiler_test.cpp ) - add_definitions(-DTESTSRCDIR="\\"${CMAKE_CURRENT_SOURCE_DIR}\\"") add_executable(kconfigcompiler_test ${kconfigcompiler_test_SRCS}) add_test(kconfig-kconfigcompiler kconfigcompiler_test) _______________________________________________ Kde-frameworks-devel mailing list Kde-frameworks-devel@kde.org https://mail.kde.org/mailman/listinfo/kde-frameworks-devel
