Diffusion Krita 66df6b5415e1

T379-resource-management
66df6b5415e1
Actions

Authored by dkazakov on Feb 28 2020, 10:33 AM.

Description

Merge remote-tracking branch 'origin/master' into rempt/T379-resource-management

Conflicts:
libs/image/tests/CMakeLists.txt

Details

Committed

dkazakov

Feb 28 2020, 10:55 AM

Parents

R37:1bfacf98b6b5: Fix filters to handle resources correctly
R37:a2452fc4cad2: Properly search for location for python3.8 folder

Branches

Unknown

Tags

Unknown

dkazakov committed R37:66df6b5415e1: Merge remote-tracking branch 'origin/master' into rempt/T379-resource-management (authored by dkazakov).Feb 28 2020, 10:55 AM

Merged Changes

Commit	Author	Details	Committed
a2452fc4cad2	dkazakov	Properly search for location for python3.8 folder	Feb 26 2020
5a38bd8411fb	dkazakov	Fix loading Appimages	Feb 26 2020
56199164d821	dkazakov	Fix ratio option on lower precision brushes	Feb 25 2020
e1278c570378	dkazakov	Fix AppImage scripts to search for Python 3.8, not Python 3.5	Feb 25 2020
19afa3688864	dkazakov	Install SIP into python3.8 prefix, not python3.5	Feb 25 2020
ee0f1f5cc6c5	rempt	Try to fix the 32 bits windows deps build of pyqt	Feb 25 2020
47fdcd94e4e0	dkazakov	Remove "broken" mark from KisAsyncMergerTest	Feb 25 2020
04a989ae54d9	dkazakov	Fix reference images for KisSyncMergerTest	Feb 25 2020
8157bb3ce895	dkazakov	Fix artifacts on filter masks applied to adjustment layers	Feb 25 2020
339367c3d93f	dkazakov	Fix compilation of broken unittests in kritaimage	Feb 25 2020
d45cb95b1bfd	dkazakov	Fix deadlocks in KoShapeManager	Feb 25 2020
145aa10bba70	dkazakov	Fix double activation of the tool on opening an image with vectors	Feb 25 2020
a17074195795	dkazakov	Revert "Clear the activationLocks before deactivating the Stroke and Fill…	Feb 25 2020
861043c8a08f	rempt	Remove unused option -qt from pyqt configure command	Feb 24 2020
8ce3a5d2643a	rempt	Download sip and pyqt from our own servers on all platforms	Feb 24 2020
e779ac30e6a4	dkazakov	Implement Airbrush and Rate options for Color Smudge brush	Feb 24 2020
d16d3e1a7d60	dkazakov	Implement 'Ratio' pressure option for Color Smudge brush	Feb 24 2020
076d88361503	rempt	Fix a possible crash if Qt doesn't give us a QScreen object.	Feb 23 2020
3bead6be553b	mwein	Fix layout issue in the history docker	Feb 22 2020
369d552c3ca9	tymond	Fix incorrect common curve in very old presets	Feb 21 2020
75e30bed3b6a	sh-zam	Android: Backport a Qt patch to fix empty locales list bug	Feb 21 2020
6c0931e8eacd	rempt	Another attempt to build with Qt 5.9	Feb 21 2020
2b45b5d22a92	rempt	Try to fix build with Qt 5.9	Feb 20 2020
1f231fca4474	rempt	Correct logic for determining whether there are multiple backups requested	Feb 20 2020
cb2fcff7ea78	mwein	Make "Save Incremental Version" update recently used files	Feb 19 2020
de8ea34d9900	lsegovia	Fix mailmap inversion	Feb 19 2020
15ca79f3882e	lsegovia	Provide .mailmap to remap my old commits	Feb 19 2020
63dff598e064	tymond	Fix crash when loading asl with tdta OSType	Feb 19 2020
66de74ed7e33	rempt	Set setRedirectPolicy(QNetworkRequest::NoLessSafeRedirectPolicy);	Feb 19 2020
2c79ab9fdb92	rempt	Try to fix the lime build	Feb 19 2020

Changes (45)

				Path	Packages
	A			.mailmap
	M			3rdparty/ext_pyqt/CMakeLists.txt
	M			3rdparty/ext_python/CMakeLists.txt
	M			3rdparty/ext_qt/CMakeLists.txt
	A			3rdparty/ext_qt/fix-locale-android.patch
	M			3rdparty/ext_sip/CMakeLists.txt
	M			libs/brush/kis_auto_brush.cpp
	M			libs/flake/KoShapeManager.cpp
	M			libs/flake/KoToolManager.cpp
	M			libs/image/kis_adjustment_layer.cc
	M			libs/image/kis_image_config.cpp
	M			libs/image/kis_image_config.h
	M			libs/image/tests/CMakeLists.txt
	M			libs/image/tests/data/async_merger_test/dependent_adj_mask.png
	M			libs/image/tests/data/async_merger_test/dependent_adj_style.png
	M			libs/image/tests/data/async_merger_test/dependent_group_mask.png
	M			libs/image/tests/data/async_merger_test/dependent_group_mask_style.png
	M			libs/image/tests/data/async_merger_test/dependent_group_style.png
	A			libs/image/tests/data/async_merger_test/mask_on_adj_initial.png
	M			libs/image/tests/data/merged_hakonepa.png
	M			libs/image/tests/kis_async_merger_test.cpp
	M			libs/image/tests/kis_async_merger_test.h
	M			libs/ui/KisDocument.cpp
	M			libs/ui/KisMainWindow.cpp
	M			libs/ui/KisMainWindow.h
	M			libs/ui/KisNetworkAccessManager.cpp
	M			libs/ui/KisPart.cpp
	M			libs/ui/KisPart.h
	M			libs/ui/KisViewManager.cpp
	M			libs/ui/widgets/KoFillConfigWidget.cpp
	M			libs/ui/widgets/KoStrokeConfigWidget.cpp
	M			libs/ui/widgets/kis_floating_message.cpp
	M			packaging/linux/appimage/build-image.sh
	M			packaging/linux/appimage/build-krita.sh
	M			packaging/macos/osxbuild.sh
	M			plugins/dockers/advancedcolorselector/kis_shade_selector_line_combo_box.cpp
	M			plugins/dockers/historydocker/HistoryDock.cpp
	M			plugins/extensions/pykrita/plugin/utilities.cpp
	M			plugins/impex/raw/3rdparty/libkdcraw/src/rwidgetutils.cpp
	M			plugins/paintops/colorsmudge/kis_colorsmudgeop.cpp
	M			plugins/paintops/colorsmudge/kis_colorsmudgeop.h
	M			plugins/paintops/colorsmudge/kis_colorsmudgeop_settings_widget.cpp
	M			plugins/paintops/libpaintop/kis_curve_option.cpp
	M			plugins/paintops/libpaintop/kis_curve_option.h
	M			plugins/paintops/libpaintop/kis_dab_cache_base.cpp