diff --git a/karbon/CMakeLists.txt b/karbon/CMakeLists.txt
index 60ab6aed170..dca0066750d 100644
--- a/karbon/CMakeLists.txt
+++ b/karbon/CMakeLists.txt
@@ -1,62 +1,61 @@
 project(karbon)
 
 #Set the correct compiler options
 IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
    # 32 bit
    MESSAGE(STATUS "Karbon detected that you use a 32 bit processor.")
 ELSE(CMAKE_SIZEOF_VOID_P EQUAL 4)
    # 64 bit (well, anything else than 32 bit, but someone use something else than 32 or 64 bit ?)
    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
    MESSAGE(STATUS "Karbon detected that you use a 64 bit processor. Added -fPIC to the CXX_FLAGS.")
 ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 4)
 
 include_directories(
     ${QT_INCLUDES}
     ${KDE4_INCLUDE_DIR}
     ${FLAKE_INCLUDES}
     ${KOTEXT_INCLUDES}
     ${KOMAIN_INCLUDES}
     ${CMAKE_SOURCE_DIR}/libs/widgets/resources
-    ${CMAKE_SOURCE_DIR}/libs/widgets/colorwidgets
     ${CMAKE_SOURCE_DIR}/karbon/ui
     ${CMAKE_SOURCE_DIR}/karbon/common
     ${CMAKE_SOURCE_DIR}/karbon/common/commands
 )
 
 add_subdirectory( common )
 add_subdirectory( ui )
 add_subdirectory( plugins )
 add_subdirectory( data )
 add_subdirectory( pics )
 add_subdirectory( templates )
 
 ########### next target ###############
 
 set(karbonpart_PART_SRCS KarbonFactoryInit.cpp )
 
 kde4_add_plugin(karbonpart ${karbonpart_PART_SRCS})
 
 target_link_libraries(karbonpart karbonui)
 
 install(TARGETS karbonpart  DESTINATION ${PLUGIN_INSTALL_DIR})
 
 ########### next target ###############
 
 set(karbon_KDEINIT_SRCS main.cpp )
 
 kde4_add_app_icon( karbon_KDEINIT_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pics/app/hi*-app-karbon.png" )
 kde4_add_kdeinit_executable( karbon ${karbon_KDEINIT_SRCS})
 
 if (Q_WS_MAC)
    set_target_properties(karbon PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.template)
    set_target_properties(karbon PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.calligra.karbon")
    set_target_properties(karbon PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Karbon 2")
 endif (Q_WS_MAC)
 
 target_link_libraries(kdeinit_karbon karbonui)
 
 install(TARGETS kdeinit_karbon  ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 target_link_libraries(karbon kdeinit_karbon)
 install(TARGETS karbon  ${INSTALL_TARGETS_DEFAULT_ARGS})
 
diff --git a/krita/CMakeLists.txt b/krita/CMakeLists.txt
index e9dd75e130b..65f16534a30 100644
--- a/krita/CMakeLists.txt
+++ b/krita/CMakeLists.txt
@@ -1,152 +1,151 @@
 project(krita)
 
 
 # 
 # The reason for this mode is that the Debug mode disable inlining
 #
 if(CMAKE_COMPILER_IS_GNUCXX)
     set(CMAKE_CXX_FLAGS_KRITADEVS "-O3 -g" CACHE STRING "" FORCE)
 endif(CMAKE_COMPILER_IS_GNUCXX)
 
 if(MSVC)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
 endif(MSVC)
 
 
 include(CheckFunctionExists)
 
 macro_optional_find_package(GLEW)
 macro_bool_to_01(GLEW_FOUND HAVE_GLEW)
 configure_file(config-glew.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-glew.h )
 macro_log_feature(HAVE_GLEW "GLEW" "The OpenGL Extension Wrangler Library" "http://glew.sourceforge.net" FALSE "" "Required by the Krita shader filter plugin")
 
 if(HAVE_GLEW)
         message(STATUS "GLEW found!")
 else(HAVE_GLEW)
         message(STATUS "GLEW NOT found - krita will not be able to use OpenGL shaders")
 endif(HAVE_GLEW)
 if(HAVE_OPENGL)
     message(STATUS "OpenGL found -- krita will be able  to use OpenGL for hardware accelerated rendering.")
 else(HAVE_OPENGL)
     message(STATUS "OpenGL NOT found - krita will not be able to use OpenGL for hardware accelerated rendering.")
 endif(HAVE_OPENGL)
 
 macro_optional_find_package(OCIO)
 macro_log_feature(OCIO_FOUND "OCIO" "The OpenColorIO Library" "http://www.opencolorio.org" FALSE "" "Required by the Krita LUT docker")
 macro_bool_to_01(OCIO_FOUND HAVE_OCIO)
 configure_file(config-ocio.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ocio.h )
 
 if(UNIX)
     set(CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES};m")
 endif(UNIX)
 
 check_function_exists(powf HAVE_POWF)
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-powf.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-powf.h)
 
 set(LINK_OPENEXR_LIB)
 if(OPENEXR_FOUND)
     include_directories(${OPENEXR_INCLUDE_DIR})
     set(LINK_OPENEXR_LIB ${OPENEXR_LIBRARIES})
     add_definitions(${OPENEXR_DEFINITIONS})
 endif(OPENEXR_FOUND)
 
 if(WIN32)
     if(MSVC)
         # C4522: 'class' : multiple assignment operators specified
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd4522")
     endif(MSVC)
 endif(WIN32)
 
 set(KRITA_INCLUDES
     # For config-*.h
     ${CMAKE_CURRENT_BINARY_DIR}
 
     ${CMAKE_SOURCE_DIR}/krita/image
     ${CMAKE_SOURCE_DIR}/krita/image/brushengine
     ${CMAKE_SOURCE_DIR}/krita/image/tiles
     ${CMAKE_SOURCE_DIR}/krita/ui
     ${CMAKE_SOURCE_DIR}/krita/ui/canvas
     ${CMAKE_SOURCE_DIR}/krita/ui/tool
     ${CMAKE_SOURCE_DIR}/krita/ui/flake
     ${CMAKE_SOURCE_DIR}/krita/ui/widgets
 
     # For generated files from .ui
     ${CMAKE_BINARY_DIR}/krita/ui
     
     ${PIGMENT_INCLUDES}
     ${KOTEXT_INCLUDES}
     ${KOMAIN_INCLUDES}
     ${CMAKE_SOURCE_DIR}/libs/widgets/resources
-    ${CMAKE_SOURCE_DIR}/libs/widgets/colorwidgets
     ${CMAKE_SOURCE_DIR}/libs/widgetutils
 
     ${EIGEN2_INCLUDE_DIR}
     
     # 'Export' this for use by filters
     CACHE INTERNAL ""
 )
 
 include_directories(${KRITA_INCLUDES})
 
 if(HAVE_OPENGL)
     include_directories(${OPENGL_INCLUDE_DIR})
     if(HAVE_GLEW)
         include_directories(${GLEW_INCLUDE_DIR})
     endif(HAVE_GLEW)
 endif(HAVE_OPENGL)
 
 add_subdirectory( image )
 add_subdirectory( ui )
 add_subdirectory( dtd )
 add_subdirectory( plugins )
 add_subdirectory( data )
 add_subdirectory( pics )
 add_subdirectory( benchmarks )
 
 set(kritapart_PART_SRCS krita_part_init.cc)
 kde4_add_plugin(kritapart ${kritapart_PART_SRCS})
 target_link_libraries(kritapart kritaui)
 install(TARGETS kritapart DESTINATION ${PLUGIN_INSTALL_DIR})
 
 set(krita_KDEINIT_SRCS main.cc)
 kde4_add_app_icon(krita_KDEINIT_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pics/hi*-app-krita.png")
 kde4_add_kdeinit_executable(krita ${krita_KDEINIT_SRCS})
 
 if (Q_WS_MAC)
     set_target_properties(krita PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.template)
     set_target_properties(krita PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.calligra.krita")
     set_target_properties(krita PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Krita 2")
 endif (Q_WS_MAC)
 
 target_link_libraries(kdeinit_krita kritaui)
 target_link_libraries(krita ${QT_QTCORE_LIBRARY} kdeinit_krita)
 
 if(CMAKE_SIZEOF_VOID_P EQUAL 8)
     find_package(OpenCTL)
     find_package(OpenShiva)
     find_package(QtShiva )
     
     if(NOT ${OPENCTL_VERSION} VERSION_GREATER 0.9.15.1 )
         # Workaround for the following issues:
         # http://bugs.kde.org/274675 http://bugs.kde.org/248051
         # http://redmine.opengtl.org/issues/72
         message(status "Found OpenGTL < 0.9.15.1, on a 64 bits system, krita will be forced linked to the libraries to make sure opengtl symbols are available")
         if(HAVE_OPENSHIVA AND HAVE_QTSHIVA)
             target_link_libraries(krita ${OPENSHIVA_LDFLAGS})
         endif()
 
         if(OPENCTL_FOUND AND OPENEXR_FOUND)
             target_link_libraries(krita ${OPENCTL_LDFLAGS})
         endif()
     endif()
 endif()
 
 install(TARGETS krita ${INSTALL_TARGETS_DEFAULT_ARGS})
 install(TARGETS kdeinit_krita ${INSTALL_TARGETS_DEFAULT_ARGS})
 install( PROGRAMS  krita.desktop  DESTINATION ${XDG_APPS_INSTALL_DIR})
 install( FILES  kritapart.desktop  DESTINATION ${SERVICES_INSTALL_DIR})
 install( FILES  krita.rc DESTINATION ${DATA_INSTALL_DIR}/krita)
 
 
 
diff --git a/plugins/dockers/CMakeLists.txt b/plugins/dockers/CMakeLists.txt
index c21ca705fd8..ddb4695f37c 100644
--- a/plugins/dockers/CMakeLists.txt
+++ b/plugins/dockers/CMakeLists.txt
@@ -1,54 +1,53 @@
 project(calligradockers)
 
 include_directories(${KDE4_INCLUDE_DIR}
      ${FLAKE_INCLUDES}
      ${KOPAGEAPP_INCLUDES}
-     ${CMAKE_SOURCE_DIR}/libs/widgets/colorwidgets
 )
 
 set(calligradockers_SRCS
 
     strokedocker/StrokeDocker.cpp
     strokedocker/StrokeDockerFactory.cpp
 
     snapguidedocker/SnapGuideDocker.cpp
     snapguidedocker/SnapGuideDockerFactory.cpp
 
     shapeproperties/ShapePropertiesDocker.cpp
     shapeproperties/ShapePropertiesDockerFactory.cpp
 
     shapecollection/CollectionShapeFactory.cpp
     shapecollection/ShapeCollectionDocker.cpp
     shapecollection/CollectionItemModel.cpp
     shapecollection/OdfCollectionLoader.cpp
 
     shadowdocker/ShadowDocker.cpp
     shadowdocker/ShadowDockerFactory.cpp
 
     styledocker/StyleDockerFactory.cpp
     styledocker/StyleDocker.cpp
     styledocker/StrokeFillWidget.cpp
     styledocker/StylePreview.cpp
     styledocker/StyleButtonBox.cpp
 
     Plugin.cpp
 )
 
 add_subdirectory( strokedocker/pics )
 
 set(calligradockers_SRCS ${calligradockers_SRCS}
     colordocker/ColorDocker.h
     colordocker/ColorDockerFactory.h
     colordocker/ColorDocker.cpp
     colordocker/ColorDockerFactory.cpp
 )
 set(EXTRA_LIBS pigmentcms kowidgets)
 
 
 kde4_add_plugin(calligradockers ${calligradockers_SRCS})
 
 target_link_libraries(calligradockers komain ${EXTRA_LIBS})
 
 install(TARGETS calligradockers DESTINATION ${PLUGIN_INSTALL_DIR})
 
 install( FILES calligradockers.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
diff --git a/plugins/textshape/CMakeLists.txt b/plugins/textshape/CMakeLists.txt
index 018db9469b3..672ed296390 100644
--- a/plugins/textshape/CMakeLists.txt
+++ b/plugins/textshape/CMakeLists.txt
@@ -1,149 +1,148 @@
 project( textPlugin)
 
 add_subdirectory( pics )
 #add_subdirectory( tests )
 
 include_directories(
     ${KOTEXT_INCLUDES}
     ${TEXTLAYOUT_INCLUDES}
     ${FLAKE_INCLUDES}
     ${KOMAIN_INCLUDES}
-    ${CMAKE_SOURCE_DIR}/libs/widgets/colorwidgets/
     ${KDE4_INCLUDE_DIR}/threadweaver/)
 
 ########### Flake Plugin library ###############
 
 SET ( textshape_SRCS
     TextPlugin.cpp
     TextShape.cpp
     TextShapeFactory.cpp
     TextTool.cpp
     TextEditingPluginContainer.cpp
     TextToolFactory.cpp
     ShrinkToFitShapeContainer.cpp
     SimpleRootAreaProvider.cpp
 
     ChangeTracker.cpp
     ReviewTool.cpp
     ReviewToolFactory.cpp
     TextChanges.cpp
     TextChange.cpp
     FontSizeAction.cpp
 
     ReferencesTool.cpp
     ReferencesToolFactory.cpp
 
 #    dialogs/StylesWidget.cpp
 #    dialogs/SpecialButton.cpp
     dialogs/StylesCombo.cpp
     dialogs/StylesComboPreview.cpp
     dialogs/DockerStylesComboModel.cpp
     dialogs/SimpleCharacterWidget.cpp
     dialogs/SimpleParagraphWidget.cpp
     dialogs/SimpleTableWidget.cpp
     dialogs/SimpleInsertWidget.cpp
     dialogs/SimpleTableOfContentsWidget.cpp
     dialogs/SimpleCitationBibliographyWidget.cpp
     dialogs/CitationInsertionDialog.cpp
     dialogs/InsertBibliographyDialog.cpp
     dialogs/SimpleFootEndNotesWidget.cpp
     dialogs/NotesConfigurationDialog.cpp
     dialogs/SimpleCaptionsWidget.cpp
     dialogs/ParagraphLayout.cpp
     dialogs/ParagraphIndentSpacing.cpp
     dialogs/ParagraphDecorations.cpp
     dialogs/ParagraphBulletsNumbers.cpp
     dialogs/ParagraphSettingsDialog.cpp
     dialogs/ParagraphDropCaps.cpp
     dialogs/ListsSpinBox.cpp
     dialogs/StylesModel.cpp
     dialogs/AbstractStylesModel.cpp
     dialogs/StylesFilteredModelBase.cpp
     dialogs/ValidParentStylesProxyModel.cpp
     dialogs/StylesDelegate.cpp
     dialogs/StyleManager.cpp
     dialogs/StyleManagerDialog.cpp
     dialogs/ParagraphGeneral.cpp
     dialogs/CharacterGeneral.cpp
     dialogs/CharacterHighlighting.cpp
     dialogs/InsertCharacter.cpp
     dialogs/FontDia.cpp
     dialogs/FontDecorations.cpp
     dialogs/LanguageTab.cpp
     dialogs/FormattingPreview.cpp
     dialogs/StyleManagerWelcome.cpp
     dialogs/TableDialog.cpp
     dialogs/QuickTableButton.cpp
     dialogs/FormattingButton.cpp
     dialogs/ChangeConfigureDialog.cpp
     dialogs/AcceptRejectChangeDialog.cpp
     dialogs/TrackedChangeModel.cpp
     dialogs/TrackedChangeManager.cpp
     dialogs/BibliographyConfigureDialog.cpp
     dialogs/TableOfContentsConfigure.cpp
     dialogs/TableOfContentsStyleConfigure.cpp
     dialogs/TableOfContentsStyleModel.cpp
     dialogs/TableOfContentsStyleDelegate.cpp
     dialogs/TableOfContentsPreview.cpp
     dialogs/TableOfContentsEntryDelegate.cpp
     dialogs/TableOfContentsEntryModel.cpp
     dialogs/TableOfContentsTemplate.cpp
     dialogs/BibliographyTemplate.cpp
     dialogs/BibliographyPreview.cpp
     dialogs/ListLevelChooser.cpp
 
     commands/ChangeListLevelCommand.cpp
     commands/ShowChangesCommand.cpp
     commands/AcceptChangeCommand.cpp
     commands/RejectChangeCommand.cpp
     commands/AutoResizeCommand.cpp
 )
 
 kde4_add_ui_files(textshape_SRCS
     dialogs/SimpleCharacterWidget.ui
     dialogs/SimpleParagraphWidget.ui
     dialogs/SimpleTableWidget.ui
     dialogs/SimpleInsertWidget.ui
     dialogs/SimpleTableOfContentsWidget.ui
     dialogs/SimpleCitationBibliographyWidget.ui
     dialogs/CitationInsertionDialog.ui
     dialogs/InsertBibliographyDialog.ui
     dialogs/SimpleFootEndNotesWidget.ui
     dialogs/NotesConfigurationDialog.ui
     dialogs/SimpleCaptionsWidget.ui
     dialogs/StylesWidget.ui
     dialogs/ParagraphLayout.ui
     dialogs/ParagraphIndentSpacing.ui
     dialogs/ParagraphDecorations.ui
     dialogs/ParagraphBulletsNumbers.ui
     dialogs/ParagraphDropCaps.ui
     dialogs/StyleManager.ui
     dialogs/CharacterGeneral.ui
     dialogs/CharacterHighlighting.ui
     dialogs/StyleManagerWelcome.ui
     dialogs/TableDialog.ui
     dialogs/BibliographyConfigureDialog.ui
     dialogs/TableOfContentsConfigure.ui
     dialogs/TableOfContentsStyleConfigure.ui 
 
     dialogs/FontDecorations.ui
     dialogs/LanguageTab.ui
     dialogs/ChangeConfigureDialog.ui
     dialogs/AcceptRejectChangeDialog.ui
     dialogs/TrackedChangeManager.ui
 )
 
 kde4_add_plugin(textshape ${textshape_SRCS})
 
 target_link_libraries(textshape kotext textlayout komain ${EXTRA_LIBS})
 if( Soprano_FOUND )
     target_link_libraries(textshape ${SOPRANO_LIBRARIES})
 endif( Soprano_FOUND )
 
 
 install(TARGETS textshape DESTINATION ${PLUGIN_INSTALL_DIR})
 
 ########### install files ###############
 
 install( FILES textshape.desktop DESTINATION ${SERVICES_INSTALL_DIR})
 #kde4_install_icons( ${DATA_INSTALL_DIR}/calligra/icons )
diff --git a/plugins/textshape/tests/CMakeLists.txt b/plugins/textshape/tests/CMakeLists.txt
index d9d9203b20a..881ee9c2233 100644
--- a/plugins/textshape/tests/CMakeLists.txt
+++ b/plugins/textshape/tests/CMakeLists.txt
@@ -1,308 +1,307 @@
 set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 include_directories( ${CMAKE_SOURCE_DIR}/plugins/textshape 
-    ${CMAKE_SOURCE_DIR}/libs/widgets/colorwidgets
     ${CMAKE_SOURCE_DIR}/plugins/textshape/dialogs
     ${CMAKE_BINARY_DIR}/plugins/textshape/dialogs
     ${CMAKE_BINARY_DIR}/plugins/textshape
     ${KOTEXT_INCLUDES}
     ${PIGMENT_INCLUDES})
 
 
 ########### next target ###############
 
 set(TestDocumentLayout_test_SRCS
     TestDocumentLayout.cpp
     TestLists.cpp
     ../TextShapeLayout.cpp
     ../TextLine.cpp
     ../Outline.cpp
     ../TextShape.cpp
     ../ListItemsHelper.cpp
     ../TableLayout.cpp
     ../TableLayoutData.cpp
     ../ToCGenerator.cpp
     ../ShrinkToFitShapeContainer.cpp
     ../FloatingAnchorStrategy.cpp
     ../InlineAnchorStrategy.cpp
 )
 
 kde4_add_unit_test(TestDocumentLayout TESTNAME shapes-text-TestDocumentLayout ${TestDocumentLayout_test_SRCS})
 
 target_link_libraries(TestDocumentLayout ${EXTRA_LIBS} komain ${QT_QTTEST_LIBRARY})
 
 ########### next target ###############
 
 set(TestChangeListCommand_test_SRCS
     TestChangeListCommand.cpp
     ../commands/TextCommandBase.cpp
     ../commands/TextCutCommand.cpp
     ../commands/ShowChangesCommand.cpp
     ../commands/AcceptChangeCommand.cpp
     ../commands/RejectChangeCommand.cpp
     ../commands/AutoResizeCommand.cpp
     ../TextTool.cpp
     ../TextEditingPluginContainer.cpp
     ../ChangeTracker.cpp
     ../dialogs/FontDia.cpp
     ../dialogs/InsertCharacter.cpp
     ../dialogs/StyleManagerDialog.cpp
     ../dialogs/SimpleStylesWidget.cpp
     ../dialogs/SimpleCharacterWidget.cpp
     ../dialogs/ParagraphSettingsDialog.cpp
     ../dialogs/SimpleParagraphWidget.cpp
     ../dialogs/FormattingButton.cpp
     ../dialogs/SimpleTableWidget.cpp
     ../dialogs/QuickTableButton.cpp
     ../dialogs/StylesWidget.cpp
     ../dialogs/FontTab.cpp
     ../dialogs/CharacterHighlighting.cpp
     ../dialogs/FontDecorations.cpp
     ../dialogs/FontLayoutTab.cpp
     ../dialogs/LanguageTab.cpp
     ../dialogs/StyleManager.cpp
     ../dialogs/ParagraphIndentSpacing.cpp
     ../dialogs/ParagraphLayout.cpp
     ../dialogs/ParagraphDecorations.cpp
     ../dialogs/ParagraphBulletsNumbers.cpp
     ../dialogs/ListsSpinBox.cpp
     ../dialogs/StylesModel.cpp
     ../dialogs/StylesDelegate.cpp
     ../dialogs/ParagraphGeneral.cpp
     ../dialogs/CharacterGeneral.cpp
     ../dialogs/NewStyleWidget.cpp
     ../dialogs/FormattingPreview.cpp
     ../dialogs/StyleManagerWelcome.cpp
     ../dialogs/TableDialog.cpp
     ../dialogs/TrackedChangeManager.cpp
     ../dialogs/TrackedChangeModel.cpp
     ../dialogs/ChangeConfigureDialog.cpp
     ../dialogs/AcceptRejectChangeDialog.cpp
     ../dialogs/ChangeTrackingOptionsWidget.cpp
     ../dialogs/SimpleTableWidget.cpp
     ../ListItemsHelper.cpp
     ../TextShape.cpp
     ../TextShapeLayout.cpp
     ../TextLine.cpp
     ../Outline.cpp
     ../TableLayout.cpp
     ../TableLayoutData.cpp
     ../ToCGenerator.cpp
     ../ShrinkToFitShapeContainer.cpp
     ../FontSizeAction.cpp
     ../FloatingAnchorStrategy.cpp
     ../InlineAnchorStrategy.cpp
 )
 
 
 kde4_add_unit_test(TestChangeListCommand TESTNAME shapes-text-TestChangeListCommand ${TestChangeListCommand_test_SRCS})
 target_link_libraries(TestChangeListCommand ${EXTRA_LIBS} komain ${QT_QTTEST_LIBRARY})
 
 ########### next target ###############
 
 set(TestChangesDatabase_test_SRCS
     TestChangesDatabase.cpp
     ../TextChanges.cpp
     ../TextChange.cpp
 )
 kde4_add_unit_test(TestChangesDatabase TESTNAME shapes-text-TestChangesDatabase ${TestChangesDatabase_test_SRCS})
 target_link_libraries(TestChangesDatabase ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY})
 
 ########### next target ###############
 
 #set(TestStylesModel_test_SRCS
 #    TestStylesModel.cpp
 #    ../dialogs/StylesModel.cpp
 #    ../TextShape.cpp
 #    ../Layout.cpp
 #    ../TextLine.cpp
 #    ../Outline.cpp
 #    ../TableLayout.cpp
 #    ../TableLayoutData.cpp
 #    ../ListItemsHelper.cpp
 #    ../ToCGenerator.cpp
 #    ../ShrinkToFitShapeContainer.cpp
 #    ../FloatingAnchorStrategy.cpp
 #    ../InlineAnchorStrategy.cpp
 #)
 #kde4_add_unit_test(TestStylesModel TESTNAME shapes-text-TestStylesModel ${TestStylesModel_test_SRCS})
 #target_link_libraries(TestStylesModel kotext ${EXTRA_LIBS} komain ${QT_QTTEST_LIBRARY})
 
 ########### next target ###############
 
 set(TestTableLayout_test_SRCS
     TestTableLayout.cpp
     ../TableLayout.cpp
     ../TableLayoutData.cpp
     ../TextShapeLayout.cpp
     ../TextLine.cpp
     ../Outline.cpp
     ../TextShape.cpp
     ../ListItemsHelper.cpp
     ../ToCGenerator.cpp
     ../ShrinkToFitShapeContainer.cpp
     ../FloatingAnchorStrategy.cpp
     ../InlineAnchorStrategy.cpp
 )
 kde4_add_unit_test(TestTableLayout TESTNAME shapes-text-TestTableLayout ${TestTableLayout_test_SRCS})
 target_link_libraries(TestTableLayout kotext komain ${QT_QTTEST_LIBRARY})
 
 ########### next target ###############
 
 set(TestSections_test_SRCS
     TestSections.cpp
     ../TableLayout.cpp
     ../TableLayoutData.cpp
     ../TextShapeLayout.cpp
     ../TextShape.cpp
     ../ListItemsHelper.cpp
     ../ToCGenerator.cpp
     ../ShrinkToFitShapeContainer.cpp
     ../TextLine.cpp
     ../Outline.cpp
     ../FloatingAnchorStrategy.cpp
     ../InlineAnchorStrategy.cpp
 )
 kde4_add_unit_test(TestSections TESTNAME shapes-text-TestSections ${TestSections_test_SRCS})
 target_link_libraries(TestSections kotext ${EXTRA_LIBS} ${QT_QTTEST_LIBRARY})
 
 ########### next target ###############
 
 set(TestTextTool_test_SRCS
     TestTextTool.cpp
     ../ChangeTracker.cpp
     ../commands/AcceptChangeCommand.cpp
     ../commands/ChangeListCommand.cpp
     ../commands/ChangeListLevelCommand.cpp
     ../commands/ChangeTrackedDeleteCommand.cpp
     ../commands/DeleteCommand.cpp
     ../commands/ListItemNumberingCommand.cpp
     ../commands/RejectChangeCommand.cpp
     ../commands/ShowChangesCommand.cpp
     ../commands/TextCommandBase.cpp
     ../commands/TextCutCommand.cpp
     ../commands/TextPasteCommand.cpp
     ../commands/AutoResizeCommand.cpp
     ../dialogs/ChangeConfigureDialog.cpp
     ../dialogs/AcceptRejectChangeDialog.cpp
     ../dialogs/CharacterGeneral.cpp
     ../dialogs/CharacterHighlighting.cpp
     ../dialogs/FontDecorations.cpp
     ../dialogs/FontDia.cpp
     ../dialogs/FontLayoutTab.cpp
     ../dialogs/FontTab.cpp
     ../dialogs/FormattingPreview.cpp
     ../dialogs/InsertCharacter.cpp
     ../dialogs/LanguageTab.cpp
     ../dialogs/ListsSpinBox.cpp
     ../dialogs/NewStyleWidget.cpp
     ../dialogs/ParagraphBulletsNumbers.cpp
     ../dialogs/ParagraphDecorations.cpp
     ../dialogs/ParagraphGeneral.cpp
     ../dialogs/ParagraphIndentSpacing.cpp
     ../dialogs/ParagraphLayout.cpp
     ../dialogs/ParagraphSettingsDialog.cpp
     ../dialogs/StyleManager.cpp
     ../dialogs/StyleManagerDialog.cpp
     ../dialogs/StyleManagerWelcome.cpp
     ../dialogs/StylesModel.cpp
     ../dialogs/StylesDelegate.cpp
     ../dialogs/SimpleStylesWidget.cpp
     ../dialogs/SimpleCharacterWidget.cpp
     ../dialogs/SimpleParagraphWidget.cpp
     ../dialogs/FormattingButton.cpp
     ../dialogs/SimpleTableWidget.cpp
     ../dialogs/QuickTableButton.cpp
     ../dialogs/StylesWidget.cpp
     ../dialogs/TableDialog.cpp
     ../dialogs/TrackedChangeManager.cpp
     ../dialogs/TrackedChangeModel.cpp
     ../dialogs/ChangeTrackingOptionsWidget.cpp
     ../TextShapeLayout.cpp
     ../TextLine.cpp
     ../Outline.cpp
     ../ListItemsHelper.cpp
     ../TableLayout.cpp
     ../TableLayoutData.cpp
     ../TextEditingPluginContainer.cpp
     ../TextShape.cpp
     ../TextTool.cpp
     ../ToCGenerator.cpp
     ../ShrinkToFitShapeContainer.cpp
     ../FontSizeAction.cpp
     ../FloatingAnchorStrategy.cpp
     ../InlineAnchorStrategy.cpp
 )
 kde4_add_unit_test(TestTextTool TESTNAME shapes-text-TestTextTool ${TestTextTool_test_SRCS})
 target_link_libraries(TestTextTool komain ${EXTRA_LIBS} ${QT_QTTEST_LIBRARY})
 
 ########### next target ###############
 
 set(TestChangeTrackedDelete_test_SRCS
     TestChangeTrackedDelete.cpp
     ../commands/ChangeListCommand.cpp
     ../commands/ChangeListLevelCommand.cpp
     ../commands/ListItemNumberingCommand.cpp
     ../commands/TextCommandBase.cpp
     ../commands/TextPasteCommand.cpp
     ../commands/TextCutCommand.cpp
     ../commands/ChangeTrackedDeleteCommand.cpp
     ../commands/DeleteCommand.cpp
     ../commands/ShowChangesCommand.cpp
     ../commands/AcceptChangeCommand.cpp
     ../commands/RejectChangeCommand.cpp
     ../commands/AutoResizeCommand.cpp
     ../TextTool.cpp
     ../TextEditingPluginContainer.cpp
     ../ChangeTracker.cpp
     ../dialogs/FontDia.cpp
     ../dialogs/InsertCharacter.cpp
     ../dialogs/StyleManagerDialog.cpp
     ../dialogs/ParagraphSettingsDialog.cpp
     ../dialogs/SimpleStylesWidget.cpp
     ../dialogs/SimpleCharacterWidget.cpp
     ../dialogs/SimpleParagraphWidget.cpp
     ../dialogs/FormattingButton.cpp
     ../dialogs/SimpleTableWidget.cpp
     ../dialogs/QuickTableButton.cpp
     ../dialogs/StylesWidget.cpp
     ../dialogs/FontTab.cpp
     ../dialogs/CharacterHighlighting.cpp
     ../dialogs/FontDecorations.cpp
     ../dialogs/FontLayoutTab.cpp
     ../dialogs/LanguageTab.cpp
     ../dialogs/StyleManager.cpp
     ../dialogs/ParagraphIndentSpacing.cpp
     ../dialogs/ParagraphLayout.cpp
     ../dialogs/ParagraphDecorations.cpp
     ../dialogs/ParagraphBulletsNumbers.cpp
     ../dialogs/ListsSpinBox.cpp
     ../dialogs/StylesModel.cpp
     ../dialogs/StylesDelegate.cpp
     ../dialogs/ParagraphGeneral.cpp
     ../dialogs/CharacterGeneral.cpp
     ../dialogs/NewStyleWidget.cpp
     ../dialogs/FormattingPreview.cpp
     ../dialogs/StyleManagerWelcome.cpp
     ../dialogs/TableDialog.cpp
     ../dialogs/TrackedChangeManager.cpp
     ../dialogs/TrackedChangeModel.cpp
     ../dialogs/ChangeConfigureDialog.cpp
     ../dialogs/AcceptRejectChangeDialog.cpp
     ../dialogs/ChangeTrackingOptionsWidget.cpp
     ../dialogs/SimpleTableWidget.cpp
     ../ListItemsHelper.cpp
     ../TextShape.cpp
     ../TextShapeLayout.cpp
     ../TextLine.cpp
     ../Outline.cpp
     ../TableLayout.cpp
     ../TableLayoutData.cpp
     ../ToCGenerator.cpp
     ../ShrinkToFitShapeContainer.cpp
     ../FontSizeAction.cpp
     ../FloatingAnchorStrategy.cpp
     ../InlineAnchorStrategy.cpp
 )
 kde4_add_unit_test(TestChangeTrackedDelete TESTNAME shapes-text-TestChangeTrackedDelete ${TestChangeTrackedDelete_test_SRCS})
 target_link_libraries(TestChangeTrackedDelete ${EXTRA_LIBS} komain kotext ${QT_QTTEST_LIBRARY})