From kde-commits Sun Feb 22 18:17:34 2015 From: Montel Laurent Date: Sun, 22 Feb 2015 18:17:34 +0000 To: kde-commits Subject: [kpat/frameworks] /: kdelibs4support-- Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=142462906431893 Git commit cb19498d6d0a8bc612c59d5deacaac830c051e55 by Montel Laurent. Committed on 22/02/2015 at 18:17. Pushed by mlaurent into branch 'frameworks'. kdelibs4support-- M +2 -3 CMakeLists.txt M +1 -1 libkcardgame/CMakeLists.txt M +1 -1 libkcardgame/kcardthemewidget.cpp http://commits.kde.org/kpat/cb19498d6d0a8bc612c59d5deacaac830c051e55 diff --git a/CMakeLists.txt b/CMakeLists.txt index 31ff0ba..d9a268b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,6 @@ find_package(KF5 REQUIRED COMPONENTS TextWidgets XmlGui KIO - KDELibs4Support NotifyConfig NewStuff) = @@ -95,9 +94,9 @@ set( kpat_SRCS = ki18n_wrap_ui( kpat_SRCS statisticsdialog.ui ) kconfig_add_kcfg_files( kpat_SRCS settings.kcfgc ) -kde4_add_app_icon( kpat_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi*-app-kp= at.png" ) +#kde4_add_app_icon( kpat_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/hi*-app-k= pat.png" ) add_executable( kpat ${kpat_SRCS} ) -target_link_libraries( kpat kcardgame KF5KDEGames KF5::KIOCore Phonon::pho= non4qt5 KF5::KDELibs4Support) +target_link_libraries( kpat kcardgame KF5KDEGames KF5::KIOCore Phonon::pho= non4qt5 KF5::I18n KF5::KDELibs4Support) install( TARGETS kpat ${INSTALL_TARGETS_DEFAULT_ARGS} ) = = diff --git a/libkcardgame/CMakeLists.txt b/libkcardgame/CMakeLists.txt index 9bf7585..0590638 100644 --- a/libkcardgame/CMakeLists.txt +++ b/libkcardgame/CMakeLists.txt @@ -10,7 +10,7 @@ set( libkcardgame_SRCS = add_library( kcardgame SHARED ${libkcardgame_SRCS} ) generate_export_header(kcardgame BASE_NAME libkcardgame) -target_link_libraries( kcardgame KF5KDEGames KF5::NewStuff KF5::KDELibs4Su= pport KF5::GuiAddons Qt5::Svg) +target_link_libraries( kcardgame KF5KDEGames KF5::NewStuff KF5::GuiAddons = Qt5::Svg KF5::Completion) = install( TARGETS kcardgame ${INSTALL_TARGETS_DEFAULT_ARGS} ) install( FILES kcardtheme.knsrc DESTINATION ${CONFIG_INSTALL_DIR} ) diff --git a/libkcardgame/kcardthemewidget.cpp b/libkcardgame/kcardthemewid= get.cpp index 77ca7ea..6130876 100644 --- a/libkcardgame/kcardthemewidget.cpp +++ b/libkcardgame/kcardthemewidget.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include = #include #include