Commit ac880641 authored by Halla Rempt's avatar Halla Rempt
Browse files

Load brushes and presets in the gui thread, in the right order

The brush server needed access to the KisResourceServerProvider singleton
in its constructor, while in the constructor of KisResourceServerProvider,
the loading of presets needed to have all the brushes loaded.

This commit moves libbrush to the krita/image and krita/ui level and
makes kritaui link to libbrush instead of the other way around. Now
we can load the brushes and then the presets.

This makes start a bit slower... But on the other hand, you cannot crash
Krita anymore by closing it while the presets are still being loaded.
parent c49319b0
......@@ -91,6 +91,7 @@ set(KRITA_INCLUDES
${CMAKE_SOURCE_DIR}/krita/image
${CMAKE_SOURCE_DIR}/krita/image/brushengine
${CMAKE_SOURCE_DIR}/krita/image/tiles
${CMAKE_SOURCE_DIR}/krita/libbrush
${CMAKE_SOURCE_DIR}/krita/ui
${CMAKE_SOURCE_DIR}/krita/ui/canvas
${CMAKE_SOURCE_DIR}/krita/ui/tool
......@@ -125,6 +126,7 @@ if(HAVE_OPENGL)
endif(HAVE_OPENGL)
add_subdirectory( image )
add_subdirectory( libbrush )
add_subdirectory( ui )
add_subdirectory( dtd )
add_subdirectory( plugins )
......
......@@ -23,9 +23,9 @@ set(kritalibbrush_LIB_SRCS
kde4_add_library(kritalibbrush SHARED ${kritalibbrush_LIB_SRCS} )
if (WIN32)
target_link_libraries(kritalibbrush kritaui ${WIN32_PLATFORM_NET_LIBS})
target_link_libraries(kritalibbrush kritaimage kowidgets ${WIN32_PLATFORM_NET_LIBS})
else (WIN32)
target_link_libraries(kritalibbrush kritaui)
target_link_libraries(kritalibbrush kritaimage kowidgets)
endif (WIN32)
......@@ -35,7 +35,7 @@ if(HAVE_VC)
# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_DEFINITIONS}")
endif(HAVE_VC)
target_link_libraries(kritalibbrush LINK_INTERFACE_LIBRARIES kritaui)
target_link_libraries(kritalibbrush LINK_INTERFACE_LIBRARIES kritaimage kowidgets)
set_target_properties(kritalibbrush PROPERTIES
VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment