move the test shell in shell/

2013-01-31 11:36:37 +01:00 · 2013-01-31 11:36:37 +01:00 · bec0cd4639
commit bec0cd4639
parent 360cb4a2cb
11 changed files with 3 additions and 2 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -195,5 +195,6 @@ include(KConfigMacros)

 add_subdirectory( desktoptheme )
 add_subdirectory( plasma )
+add_subdirectory( shell )

 feature_summary(WHAT ALL   FATAL_ON_MISSING_REQUIRED_PACKAGES)
--- a/plasma/tests/CMakeLists.txt
+++ b/plasma/tests/CMakeLists.txt
@ -33,5 +33,3 @@ if(QCA2_FOUND)
  target_link_libraries(plasmoidpackagetest ${QCA2_LIBRARIES})
 endif(QCA2_FOUND)

-add_subdirectory(shelltest)
-
--- a/plasma/tests/shelltest/CMakeLists.txt
+++ b/plasma/tests/shelltest/CMakeLists.txt
@ -48,3 +48,5 @@ target_link_libraries(testplasma2
 ${KDE4_PLASMA_LIBS}
 #plasma
 )
+
+install(TARGETS testplasma2 ${INSTALL_TARGETS_DEFAULT_ARGS})
--- a/plasma/tests/shelltest/desktopcorona.cpp
+++ b/plasma/tests/shelltest/desktopcorona.cpp
--- a/plasma/tests/shelltest/desktopcorona.h
+++ b/plasma/tests/shelltest/desktopcorona.h
--- a/plasma/tests/shelltest/main.cpp
+++ b/plasma/tests/shelltest/main.cpp
--- a/plasma/tests/shelltest/main.qml
+++ b/plasma/tests/shelltest/main.qml
--- a/plasma/tests/shelltest/svg.cpp
+++ b/plasma/tests/shelltest/svg.cpp
--- a/plasma/tests/shelltest/svg.h
+++ b/plasma/tests/shelltest/svg.h
--- a/plasma/tests/shelltest/view.cpp
+++ b/plasma/tests/shelltest/view.cpp
--- a/plasma/tests/shelltest/view.h
+++ b/plasma/tests/shelltest/view.h