Merge remote-tracking branch 'upstream/master'
d2ea62b69eaa
Actions

Authored by surt on Jun 14 2019, 6:58 PM.

Description

Merge remote-tracking branch 'upstream/master'

Details

Committed

surt	Jun 14 2019, 6:58 PM

Parents

R37:bd2c86842110: Need to add new patterns to cmake.
R37:429dd9cdadae: Update brush preview on every stamp creation

Branches

Unknown

Tags

Unknown

surt committed R37:d2ea62b69eaa: Merge remote-tracking branch 'upstream/master' (authored by surt).Jun 14 2019, 6:58 PM

Merged Changes

Commit	Author	Details	Committed
429dd9cdadae	vanyossi	Update brush preview on every stamp creation	Jun 14 2019
2bd45acfc02d	dkazakov	Fix Qt patches for Qt 5.12.3	Jun 14 2019
c06107d67335	amedonosova	Fix 'Enforce palette colors' feature	Jun 14 2019
e09e18e55006	rempt	Use untranslated strings to store the last used open pane	Jun 14 2019
9f96e41ec05a	eszlari	Linux/appdata: add content_rating	Jun 14 2019

Changes (34)

				Path	Packages
	M			3rdparty/ext_qt/0002-Don-t-request-the-MIME-image-every-time-Windows-asks.patch
	M			3rdparty/ext_qt/0003-Hack-always-return-we-support-DIBV5.patch
	M			3rdparty/ext_qt/0004-Fix-debug-on-openGL-ES.patch
	M			3rdparty/ext_qt/0005-cumulative-patch-for-hdr.patch
	P			3rdparty/ext_qt/0020-Synthesize-Enter-LeaveEvent-for-accepted-QTabletEven.patch Copied from 3rdparty/ext_qt/0012-Synthesize-Enter-LeaveEvent-for-accepted-QTabletEven.patch
	M			3rdparty/ext_qt/0022-Fix-generation-of-Leave-events-when-using-tablet-dev.patch
	M			3rdparty/ext_qt/0023-Implement-a-switch-for-tablet-API-on-Windows.patch
	M			3rdparty/ext_qt/0024-Fetch-stylus-button-remapping-from-WinTab-driver.patch
	M			3rdparty/ext_qt/0025-Disable-tablet-relative-mode-in-Qt.patch
	M			3rdparty/ext_qt/0026-Fetch-mapped-screen-size-from-the-Wintab-driver.patch
	M			3rdparty/ext_qt/0027-Switch-stylus-pointer-type-when-the-tablet-is-in-the.patch
	A			3rdparty/ext_qt/0028-Fix-updating-tablet-pressure-resolution-on-every-pro.patch
	M			3rdparty/ext_qt/0031-Compute-logical-DPI-on-a-per-screen-basis.patch
	M			3rdparty/ext_qt/0032-Update-Dpi-and-scale-factor-computation.patch
	M			3rdparty/ext_qt/0033-Move-QT_FONT_DPI-to-cross-platform-code.patch
	M			3rdparty/ext_qt/0034-Update-QT_SCREEN_SCALE_FACTORS.patch
	M			3rdparty/ext_qt/0035-Deprecate-QT_AUTO_SCREEN_SCALE_FACTOR.patch
	M			3rdparty/ext_qt/0036-Add-high-DPI-scale-factor-rounding-policy-C-API.patch
	M			3rdparty/ext_qt/0050-Fix-using-tablet-on-QML-widgets.patch
	M			3rdparty/ext_qt/0051-Add-workaround-for-handling-table-press-correctly-in.patch
	M			3rdparty/ext_qt/CMakeLists.txt
	M			3rdparty/ext_qt/remove-fullscreen-border-hack.patch
	M			3rdparty/ext_qt/set-has-border-in-full-screen-default.patch
	M			krita/org.kde.krita.appdata.xml
	M			libs/ui/KisMainWindow.cpp
	M			libs/ui/KisOpenPane.cpp
	M			libs/ui/KisOpenPane.h
	M			libs/widgets/KisDlgInternalColorSelector.cpp
	M			libs/widgets/kis_palette_view.cpp
	M			libs/widgets/kis_palette_view.h
	M			plugins/dockers/palettedocker/palettedocker_dock.cpp
	M			plugins/paintops/libpaintop/kis_brush_chooser.cpp
	M			plugins/paintops/libpaintop/kis_custom_brush_widget.cpp
	M			plugins/paintops/libpaintop/kis_custom_brush_widget.h