Port to KF5 renaming changes

This commit is contained in:
Martin Klapetek 2013-12-11 21:41:47 +01:00
parent 73054577df
commit 54bc491c46
20 changed files with 65 additions and 65 deletions

View file

@ -244,16 +244,16 @@ set(kwin_QT_LIBS
)
set(kwin_KDE_LIBS
KF5::KDeclarative
KF5::KConfigCore
KF5::KCoreAddons
KF5::KCrash
KF5::Declarative
KF5::ConfigCore
KF5::CoreAddons
KF5::Crash
KF5::GlobalAccel
KF5::KI18n
KF5::KNotifications
KF5::KService
KF5::I18n
KF5::Notifications
KF5::Service
KF5::Plasma
KF5::KWindowSystem
KF5::WindowSystem
KF5::XmlGui
)

View file

@ -15,8 +15,8 @@ set(kwin3_aurorae_PART_SRCS
kde4_add_plugin(kwin3_aurorae ${kwin3_aurorae_PART_SRCS})
target_link_libraries(kwin3_aurorae
KF5::KConfigCore
KF5::KService
KF5::ConfigCore
KF5::Service
Qt5::Quick
Qt5::Widgets
kdecorations
@ -34,7 +34,7 @@ add_library(decorationplugin SHARED ${decoration_plugin_SRCS})
target_link_libraries(decorationplugin
Qt5::Quick
kdecorations
KF5::KConfigWidgets
KF5::ConfigWidgets
KF5::Plasma
)
install(TARGETS decorationplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/kwin/decoration)

View file

@ -6,6 +6,6 @@ set(plastik_plugin_SRCS
qt4_automoc(${plastik_plugin_SRCS})
add_library(plastikplugin SHARED ${plastik_plugin_SRCS})
target_link_libraries(plastikplugin Qt5::Core Qt5::Quick KF5::KConfigWidgets kdecorations)
target_link_libraries(plastikplugin Qt5::Core Qt5::Quick KF5::ConfigWidgets kdecorations)
install(TARGETS plastikplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/kwin/decorations/plastik)
install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/kwin/decorations/plastik)

View file

@ -24,7 +24,7 @@ kconfig_add_kcfg_files(kwin_oxygen_SRCS oxygenconfiguration.kcfgc )
add_library(kwin3_oxygen MODULE ${kwin_oxygen_SRCS})
target_link_libraries(kwin3_oxygen Qt5::Widgets )
target_link_libraries(kwin3_oxygen KF5::KI18n KF5::KWindowSystem KF5::KStyle)
target_link_libraries(kwin3_oxygen KF5::I18n KF5::WindowSystem KF5::Style)
target_link_libraries(kwin3_oxygen kdecorations)

View file

@ -26,7 +26,7 @@ add_library(kwin_oxygen_config MODULE
${kwin_oxygen_config_PART_FORMS_HEADERS})
target_link_libraries(kwin_oxygen_config Qt5::Core Qt5::Gui Qt5::Widgets Qt5::DBus)
target_link_libraries(kwin_oxygen_config KF5::KWindowSystem KF5::KCompletion)
target_link_libraries(kwin_oxygen_config KF5::WindowSystem KF5::Completion)
target_link_libraries(kwin_oxygen_config kdecorations oxygenstyle oxygenstyleconfig)
if(X11_FOUND)

View file

@ -13,7 +13,7 @@ qt5_wrap_ui(oxygen_shadow_demo_FORMS_HEADERS ${oxygen_shadow_demo_FORMS})
add_executable(oxygen-shadow-demo ${oxygen_shadow_demo_SOURCES} ${oxygen_shadow_demo_FORMS_HEADERS})
target_link_libraries(oxygen-shadow-demo Qt5::Core Qt5::Gui Qt5::Widgets Qt5::DBus)
target_link_libraries(oxygen-shadow-demo KF5::KI18n)
target_link_libraries(oxygen-shadow-demo KF5::I18n)
target_link_libraries(oxygen-shadow-demo oxygenstyle )
if(X11_FOUND)

View file

@ -3,14 +3,14 @@ set(kwin_effect_OWN_LIBS
)
set(kwin_effect_KDE_LIBS
KF5::KConfigCore
KF5::KConfigWidgets
KF5::ConfigCore
KF5::ConfigWidgets
KF5::GlobalAccel
KF5::KI18n
KF5::KWindowSystem
KF5::I18n
KF5::WindowSystem
KF5::Plasma # screenedge effect
KF5::KIconThemes
KF5::KService
KF5::IconThemes
KF5::Service
)
set(kwin_effect_QT_LIBS
@ -83,11 +83,11 @@ macro( KWIN4_ADD_EFFECT_CONFIG name )
Qt5::Widgets
Qt5::Quick
KF5::KIOWidgets # KUrlRequester
KF5::KCoreAddons
KF5::KCompletion
KF5::KConfigWidgets
KF5::CoreAddons
KF5::Completion
KF5::ConfigWidgets
KF5::GlobalAccel
KF5::KI18n
KF5::I18n
KF5::XmlGui
)
install( TARGETS kcm_kwin4_effect_${name} DESTINATION ${PLUGIN_INSTALL_DIR} )

View file

@ -11,7 +11,7 @@ set(kwin_xml ${KDEBASE_WORKSPACE_SOURCE_DIR}/kwin/org.kde.KWin.xml)
set_source_files_properties(${kwin_xml} PROPERTIES INCLUDE "interface_util.h")
qt5_add_dbus_interface(kcm_kwincompositing_PART_SRCS ${kwin_xml} kwin_interface)
add_library(kcm_kwincompositing MODULE ${kcm_kwincompositing_PART_SRCS})
target_link_libraries(kcm_kwincompositing KF5::KNewStuff ${KDE4_KCMUTILS_LIBS} ${KDE4_KDEUI_LIBS} ${X11_LIBRARIES})
target_link_libraries(kcm_kwincompositing KF5::NewStuff ${KDE4_KCMUTILS_LIBS} ${KDE4_KDEUI_LIBS} ${X11_LIBRARIES})
install(TARGETS kcm_kwincompositing DESTINATION ${PLUGIN_INSTALL_DIR} )

View file

@ -30,9 +30,9 @@ target_link_libraries(kcm_kwindecoration
Qt5::Quick
Qt5::UiTools
KF5::KCMUtils
KF5::KCompletion
KF5::KI18n
KF5::KNewStuff
KF5::Completion
KF5::I18n
KF5::NewStuff
)
install(TARGETS kcm_kwindecoration DESTINATION ${PLUGIN_INSTALL_DIR} )

View file

@ -9,10 +9,10 @@ add_library(kcm_kwindesktop MODULE ${kcm_kwindesktop_PART_SRCS})
target_link_libraries(kcm_kwindesktop
Qt5::X11Extras
KF5::KCMUtils
KF5::KCompletion
KF5::Completion
KF5::GlobalAccel
KF5::KI18n
KF5::KWindowSystem
KF5::I18n
KF5::WindowSystem
KF5::XmlGui
${X11_LIBRARIES}
)

View file

@ -3,7 +3,7 @@
set(kcm_kwinoptions_PART_SRCS windows.cpp mouse.cpp main.cpp )
kde4_add_ui_files(kcm_kwinoptions_PART_SRCS actions.ui advanced.ui focus.ui mouse.ui moving.ui)
add_library(kcm_kwinoptions MODULE ${kcm_kwinoptions_PART_SRCS})
target_link_libraries(kcm_kwinoptions Qt5::DBus KF5::KCompletion KF5::KI18n KF5::KCMUtils KF5::KDE4Support)
target_link_libraries(kcm_kwinoptions Qt5::DBus KF5::Completion KF5::I18n KF5::KCMUtils KF5::KDE4Support)
install(TARGETS kcm_kwinoptions DESTINATION ${PLUGIN_INSTALL_DIR} )

View file

@ -21,9 +21,9 @@ set(kcm_libs
Qt5::Concurrent
Qt5::X11Extras
KF5::KCMUtils
KF5::KCompletion
KF5::KI18n
KF5::KWindowSystem
KF5::Completion
KF5::I18n
KF5::WindowSystem
KF5::XmlGui
${X11_LIBRARIES}
)

View file

@ -10,11 +10,11 @@ kde4_add_ui_files( kcm_kwinscreenedges_PART_SRCS main.ui )
add_library( kcm_kwinscreenedges MODULE ${kcm_kwinscreenedges_PART_SRCS} )
target_link_libraries( kcm_kwinscreenedges ${X11_LIBRARIES}
Qt5::DBus
KF5::KCompletion
KF5::KConfigCore
KF5::KConfigWidgets
KF5::KI18n
KF5::KService
KF5::Completion
KF5::ConfigCore
KF5::ConfigWidgets
KF5::I18n
KF5::Service
KF5::Plasma
)
install( TARGETS kcm_kwinscreenedges DESTINATION ${PLUGIN_INSTALL_DIR} )

View file

@ -14,9 +14,9 @@ target_link_libraries(kcm_kwin_scripts
Qt5::DBus
KF5::KCMUtils
KF5::KIOCore
KF5::KI18n
KF5::I18n
KF5::Plasma
KF5::KNewStuff
KF5::NewStuff
)
install(TARGETS kcm_kwin_scripts DESTINATION ${PLUGIN_INSTALL_DIR})

View file

@ -23,16 +23,16 @@ target_link_libraries(kcm_kwintabbox
Qt5::Quick
Qt5::X11Extras
KF5::KCMUtils
KF5::KCompletion
KF5::KDeclarative
KF5::Completion
KF5::Declarative
KF5::GlobalAccel
KF5::KI18n
KF5::KIconThemes
KF5::KService
KF5::KWindowSystem
KF5::I18n
KF5::IconThemes
KF5::Service
KF5::WindowSystem
KF5::Plasma
KF5::XmlGui
KF5::KNewStuff
KF5::NewStuff
${XCB_XCB_LIBRARY})
install(TARGETS kcm_kwintabbox DESTINATION ${PLUGIN_INSTALL_DIR} )

View file

@ -9,9 +9,9 @@ set_target_properties(kwin_killer_helper PROPERTIES COMPILE_FLAGS ${Qt5Widgets_E
target_link_libraries(kwin_killer_helper
Qt5::Widgets
Qt5::X11Extras
KF5::KAuth
KF5::KI18n
KF5::KWidgetsAddons
KF5::Auth
KF5::I18n
KF5::WidgetsAddons
)
install(TARGETS kwin_killer_helper DESTINATION ${LIBEXEC_INSTALL_DIR} )

View file

@ -11,9 +11,9 @@ add_library(kdecorations SHARED ${kdecorations_LIB_SRCS})
generate_export_header(kdecorations EXPORT_FILE_NAME kdecorations_export.h)
target_link_libraries(kdecorations
Qt5::Widgets
KF5::KConfigCore
KF5::KI18n
KF5::KService # KLibrary
KF5::ConfigCore
KF5::I18n
KF5::Service # KLibrary
)
# target_link_libraries(kdecorations LINK_INTERFACE_LIBRARIES ${KDE4_KDEUI_LIBS})

View file

@ -15,7 +15,7 @@ set(kwineffects_QT_LIBS
)
set(kwineffects_KDE_LIBS
KF5::KConfigCore
KF5::ConfigCore
)
set(kwineffects_XCB_LIBS

View file

@ -1,10 +1,10 @@
set(kcm_kwin4_genericscripted_SRCS genericscriptedconfig.cpp)
kde4_add_plugin( kcm_kwin4_genericscripted ${kcm_kwin4_genericscripted_SRCS} )
target_link_libraries( kcm_kwin4_genericscripted
KF5::KConfigWidgets #KCModule
KF5::KDeclarative
KF5::KI18n
KF5::KService
KF5::ConfigWidgets #KCModule
KF5::Declarative
KF5::I18n
KF5::Service
KF5::Plasma
Qt5::DBus
Qt5::UiTools )

View file

@ -31,10 +31,10 @@ target_link_libraries( testWindowPaintData kwineffects Qt5::Widgets Qt5::Test )
# target_link_libraries( testVirtualDesktops
# Qt5::Test
# Qt5::Widgets
# KF5::KI18n
# KF5::I18n
# KF5::GlobalAccel
# KF5::KConfigCore
# KF5::KWindowSystem
# KF5::ConfigCore
# KF5::WindowSystem
# )
########################################################
@ -54,7 +54,7 @@ target_link_libraries( testClientMachine
Qt5::Test
Qt5::X11Extras
Qt5::Widgets
KF5::KWindowSystem
KF5::WindowSystem
${XCB_XCB_LIBRARY}
${XCB_XFIXES_LIBRARY}
${X11_X11_LIB} # to make jenkins happy