From kde-commits  Thu May 29 20:52:14 2014
From: shivam makkar <amourphious1992 () gmail ! com>
Date: Thu, 29 May 2014 20:52:14 +0000
To: kde-commits
Subject: [plasma-desktop/amourphious/als] kcms/keyboard: finishing rebase to master
Message-Id: <E1Wq7J8-0000Sw-AR () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=140139674121533

Git commit 66a0f030ffe0bda67d550a3a38ae2275d82c0a79 by shivam makkar.
Committed on 30/05/2014 at 02:22.
Pushed by makkar into branch 'amourphious/als'.

finishing rebase to master

M  +0    -4    kcms/keyboard/CMakeLists.txt
M  +2    -6    kcms/keyboard/tests/CMakeLists.txt

http://commits.kde.org/plasma-desktop/66a0f030ffe0bda67d550a3a38ae2275d82c0=
a79

diff --git a/kcms/keyboard/CMakeLists.txt b/kcms/keyboard/CMakeLists.txt
old mode 100755
new mode 100644
index 6493727..7f9e122
--- a/kcms/keyboard/CMakeLists.txt
+++ b/kcms/keyboard/CMakeLists.txt
@@ -167,8 +167,6 @@ set(kcm_keyboard_PART_SRCS
     LanguageDetection/languagedetector.cpp
     ${preview_SRCS} )
 =

-
-
 qt5_wrap_ui(kcm_keyboard_PART_SRCS kcm_keyboard.ui kcm_add_layout_dialog.u=
i kcmmiscwidget.ui)
 =

 add_library(kcm_keyboard MODULE ${kcm_keyboard_PART_SRCS})
@@ -205,8 +203,6 @@ add_subdirectory( pics )
 =

 # Unit tests
 =

-
 add_subdirectory( tests )
 =

 add_subdirectory( LanguageDetection/langdata )
-
diff --git a/kcms/keyboard/tests/CMakeLists.txt b/kcms/keyboard/tests/CMake=
Lists.txt
old mode 100755
new mode 100644
index c35f5c2..2f5d574
--- a/kcms/keyboard/tests/CMakeLists.txt
+++ b/kcms/keyboard/tests/CMakeLists.txt
@@ -10,7 +10,7 @@ macro(KEYBOARD_DAEMON_UNIT_TESTS _testname)
                                      Qt5::Xml
                                      Qt5::Test
                                      KF5::I18n
-                                     KF5::KDE4Support
+                                     KF5::KDELibs4Support
                                      ${X11_Xkbfile_LIB}
                                      ${X11_LIBRARIES}
 )
@@ -42,7 +42,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config/base.ba=
d.xml ${CMAKE_CURRENT_B
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config/base.xml ${CMAKE_CURRENT=
_BINARY_DIR}/config/base.xml COPYONLY)
 =

 if( X11_XTest_FOUND )
-   add_executable(keyboard_daemon_test keyboard_daemon_test.cpp ../keyboar=
d_daemon.cpp ../layout_memory.cpp ../layout_memory_persister.cpp ../flags.c=
pp ../x11_helper.cpp ../xkb_helper.cpp ../xinput_helper.cpp ../layout_tray_=
icon.cpp ../keyboard_config.cpp ../xkb_rules.cpp ../keyboard_hardware.cpp .=
./bindings.cpp ../layouts_menu.cpp ../numlockx.c)
+   add_executable(keyboard_daemon_test keyboard_daemon_test.cpp ../keyboar=
d_daemon.cpp ../layout_memory.cpp ../layout_memory_persister.cpp ../flags.c=
pp ../x11_helper.cpp ../xkb_helper.cpp ../xinput_helper.cpp ../layout_tray_=
icon.cpp ../keyboard_config.cpp ../xkb_rules.cpp ../keyboard_hardware.cpp .=
./bindings.cpp ../layouts_menu.cpp ../numlockx.c ../LanguageDetection/langu=
agedetector.cpp ../LanguageDetection/training_text_map.cpp)
    add_test(kcm-keyboard-keyboard_daemon_test keyboard_daemon_test)
    ecm_mark_nongui_executable(keyboard_daemon_test)
    ecm_mark_as_test(keyboard_daemon_test)
@@ -55,14 +55,10 @@ if( X11_XTest_FOUND )
                          KF5::CoreAddons
                          KF5::DBusAddons
                          KF5::Plasma
-<<<<<<< HEAD
                          KF5::KDELibs4Support
                          KF5::GlobalAccel
                          XCB::XCB
                          XCB::XKB
-=3D=3D=3D=3D=3D=3D=3D
-                         KF5::KDE4Support
->>>>>>> added automatic layout switching, geometry preview and removed war=
nings at time of build and runtime
                          ${X11_Xkbfile_LIB}
                          ${X11_XTest_LIB}
                          ${X11_LIBRARIES}