Diffusion Calligra a31799295d6f

Merge commit 'da345aaa7b24425d85c4d895' into krita-animation-kf5-kazakov
a31799295d6f
Actions

Authored by dkazakov.

Description

Merge commit 'da345aaa7b24425d85c4d895' into krita-animation-kf5-kazakov

Conflicts:
krita/image/kis_default_bounds.cpp
krita/image/kis_dom_utils.cpp
krita/image/kis_image.h
krita/image/kis_image_config.cpp
krita/image/kis_node.h
krita/image/kis_node_graph_listener.cpp
krita/image/kis_strokes_queue.h
krita/image/kis_updater_context.h
krita/image/tests/CMakeLists.txt
krita/image/tests/kis_paint_device_test.cpp
krita/image/tests/kis_strokes_queue_test.cpp
krita/image/tests/kis_transaction_test.cpp
krita/libbrush/kis_auto_brush.cpp
krita/plugins/paintops/libpaintop/kis_brush_based_paintop.cpp
krita/plugins/paintops/libpaintop/kis_texture_option.cpp
krita/plugins/tools/defaulttools/strokes/move_stroke_strategy.h
krita/plugins/tools/defaulttools/tests/CMakeLists.txt
krita/ui/kis_paintop_option.h
krita/ui/opengl/kis_opengl_canvas2.cpp
krita/ui/tests/CMakeLists.txt
krita/ui/tests/freehand_stroke_test.cpp
krita/ui/tests/kis_kra_saver_test.cpp

Details

Committed
dkazakovOct 8 2015, 11:14 AM
Parents
R8:59623cdb681e: Fix compilation after merge
R8:da345aaa7b24: Better handling of temp:// urls in QUrl times
Branches
Unknown
Tags
Unknown

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
da345aaa7b24kossebau
Better handling of temp:// urls in QUrl times 
Sep 29 2015
c0b45a4540d5kossebau
Add missing checks for toolManager.currentTool in Sketch toolconfigpages 
Sep 29 2015
9086c1bb45c5kossebau
Fix Sketch's panels/menu/base color 
Sep 29 2015
bf951e459f50kossebau
Have Sketch build and start to welcome screen at least again (rest broken) 
Sep 28 2015
d0602bc5d77akossebau
Fix port to QMimeDatabase 
Sep 28 2015
d42ebf9ddb3akossebau
Port Sketch away from KComponentData 
Sep 28 2015
000e4faea309kossebau
Some QUrl porting fixups 
Sep 28 2015
10dea7343950kossebau
Port QGLWidget -> QOpenGLWidget in Sketch 
Sep 28 2015
895c8a072415kossebau
Remove unneeded includes 
Sep 28 2015
478527a754cfkossebau
Port KGlobal::config() to KSharedConfig::openConfig() in Sketch 
Sep 28 2015
d3f5315e9be4kossebau
Add missing includes 
Sep 28 2015
bb6d44cd2dd5kossebau
QTouchEvent::TouchPoint::isPrimary() is removed in Qt 5.4 
Sep 28 2015
8b5fb126b975kossebau
Port Sketch plugins to Qt5 plugin system 
Sep 28 2015
821d7c984c5frempt
And don't include... 
Sep 28 2015
48d58083038arempt
Don't #include a header from _braindump_ in as plugin 
Sep 28 2015
3e59a7ae6f98scottpetrovic
woops. remove qdebug I should have deleted with last commit 
Sep 26 2015
5eaef857f1e5scottpetrovic
make eraser mode and reload icons change with theme 
Sep 26 2015
b919abfe8352kossebau
Remove unused includes 
Sep 26 2015
060db70592a5rempt
Try the unthemed icons last 
Sep 26 2015
fc853304189cscottpetrovic
remove arrow images from CmakeList so install works 
Sep 26 2015
5c26b1eb6db2kossebau
Unbreak build: klocale.h no longer is for i18n, klocalizedstring.h is now 
Sep 26 2015
8e1b94e21e25D378abrahams
Clean krita/image includes and definitions 
Sep 25 2015
2dd5e6ddca0drempt
Start loading (some) icons through the qrc resource mechanism 
Sep 25 2015
c458a9b37c3crempt
Check whether the line is empty before splitting 
Sep 25 2015
a6422e8124ffrempt
Re-enable breeze 
Sep 25 2015
5d0aad765c11timotheegiet
fix some svg icons 
Sep 25 2015
cd9b83cbdbecrempt
Unbreak build 
Sep 25 2015
388a5098df6erempt
Make settings the styles a bit smarter 
Sep 25 2015
77c12794eb6fabrahams
Document unused code path in psd_read_pattern 
Sep 24 2015
3451a3b0f06cD374abrahams
Clean includes and forward declarations in krita/ui 
Sep 24 2015
dd4ee599afbbrempt
Put showing the first mainwindow in the event queue 
Sep 24 2015
33c87cbce08arempt
Deduplicate the list of dirs QStandardPaths::locate returns 
Sep 24 2015
10f06e0a711frempt
Pass the no-duplicates flag when loading predefined image sizes 
Sep 24 2015
7ebb0ae4d86erempt
Move the dockwidget font calculation to KoDockRegistry 
Sep 24 2015
94d849c48099rempt
Make it possible to run krita2 and krita3 next to each other 
Sep 24 2015
5ddcf25d68c5kossebau
Restore API in KoImageData used by chartshape plugin 
Sep 24 2015
7fc5c0d3027brempt/kossebau
Only build the gray f16 colorspace if we have openexr 
Sep 24 2015
abbadb558eb7timotheegiet
fix some svg icons 
Sep 24 2015
48969ce9e590rempt
Set the default shortcuts on the action collection, not the action 
Sep 23 2015
a7c082083657rempt
debug-- 
Sep 23 2015
8163f9c157e5timotheegiet/rempt
clean some svg files 
Sep 23 2015
105eb852ae35rempt
Open the temporary file again, it might be closed. 
Sep 23 2015
27cc6854ee7erempt
Replace regexp to get the suffix by QFileInfo 
Sep 23 2015
edde7cc8942brempt
Reorganize the KoImageData Api 
Sep 23 2015
c6de02ea8ea6rempt
Fix typoes in comment 
Sep 23 2015
39bc22a04467rempt
Remove an old todo 
Sep 23 2015
f0530400de21rempt
Remove createExternalImageData and setExernalImage 
Sep 23 2015
6c0f85611bcdrempt
Don't use the localized string if it isn't there. 
Sep 23 2015
fffc392c64f5rempt
debug-- 
Sep 23 2015
ebe092a90675rempt
Fix warning 
Sep 23 2015

Very Large Commit

This commit is very large, and affects more than 1000 files. Changes are not shown.