Diffusion Krita 9335a99139d2

Merge branch 'master' into rempt/T379-resource-management
9335a99139d2
Actions

Authored by rempt on Mar 19 2019, 7:03 AM.

Description

Merge branch 'master' into rempt/T379-resource-management

Details

Committed

rempt

Mar 19 2019, 7:03 AM

Parents

R37:0f5820825de8: macos build improvements
R37:d096a84aae89: Merge branch 'master' into rempt/T379-resource-management

Branches

Unknown

Tags

Unknown

rempt committed R37:9335a99139d2: Merge branch 'master' into rempt/T379-resource-management (authored by rempt).Mar 19 2019, 7:03 AM

Merged Changes

Commit		Author	Details	Committed
0f5820825de8		vanyossi	macos build improvements	Mar 18 2019
ef217ccd9408		rempt	Remove debug output now build magically works again	Mar 18 2019
8161893484cc	D19776	amedonosova	Better pointer handling in KisMirrorManager and KisMirrorAxis	Mar 18 2019
54a1e8272f1b		rempt	Try to build sip again	Mar 18 2019
2924b7b976e3		dkazakov	Make Krita compile on Qt 5.9	Mar 18 2019
9c521e39885c		rempt	More debug output...	Mar 18 2019
91963c577fad		dkazakov	Update Qt patches to support tablet in HiDPI mode on X11	Mar 18 2019
838ad68c882f		rempt	Add more debug output...	Mar 18 2019
5268f29de4d4		rempt	Remove obsolete scripts	Mar 18 2019
0af06671904c		rempt	Add more debugging to the build-image script...	Mar 18 2019
3532330eb8ec		rempt	Let's skip sip for now, to make sure it is the problem	Mar 18 2019
e66855a9153e		rempt	Try harder to find sip.so	Mar 18 2019

Changes (40)

				Path	Packages
	M			3rdparty/ext_qt/0010-Fix-tablet-jitter-on-X11.patch
	M			3rdparty/ext_qt/0011-Add-an-ID-for-recognition-of-UGEE-tablets.patch
	V			3rdparty/ext_qt/{0012-Synthesize-Enter-LeaveEvent-for-accepted-QTabletEven.patch ← 0012-Synthesize-Enter-LeaveEvent-when-QTabletEvent-is-acc.patch}
	V			3rdparty/ext_qt/{0012-Synthesize-Enter-LeaveEvent-when-QTabletEvent-is-acc.patch → 0012-Synthesize-Enter-LeaveEvent-for-accepted-QTabletEven.patch}
	M			3rdparty/ext_qt/CMakeLists.txt
	M			CMakeLists.txt
	M			libs/image/kis_types.h
	M			libs/ui/canvas/kis_mirror_axis.cpp
	M			libs/ui/canvas/kis_mirror_axis.h
	M			libs/ui/dialogs/kis_dlg_preferences.cc
	M			libs/ui/kis_mirror_manager.cpp
	M			libs/ui/kis_mirror_manager.h
	M			libs/ui/opengl/KisOpenGLModeProber.cpp
	M			libs/ui/opengl/KisOpenGLModeProber.h
	M			libs/ui/opengl/KisScreenInformationAdapter.cpp
	M			libs/ui/opengl/KisScreenInformationAdapter.h
	P			libs/ui/opengl/KisSurfaceColorSpace.h Copied from plugins/dockers/smallcolorselector/kis_gl_image_widget.vert
	M			libs/ui/opengl/kis_opengl.cpp
	M			packaging/linux/appimage/build-image.sh
	D			packaging/macos/Makefile
	D			packaging/macos/b.sh
	D			packaging/macos/build-deps.sh
	D			packaging/macos/build-release.sh
	D			packaging/macos/configure.sh
	D			packaging/macos/deploy.sh
	D			packaging/macos/deploy5.sh
	D			packaging/macos/env.sh
	D			packaging/macos/fixrpath.sh
	D			packaging/macos/macdeploy-qt.diff
	D			packaging/macos/notes.txt
	M			packaging/macos/osxdeploy.sh
	D			packaging/macos/run-cmake-3rdparty.sh
	D			packaging/macos/run-cmake-gmic-qt.sh
	D			packaging/macos/run-cmake-krita.sh
	M			plugins/dockers/lut/lutdocker_dock.cpp
	M			plugins/dockers/smallcolorselector/KisClickableGLImageWidget.cpp
	M			plugins/dockers/smallcolorselector/KisClickableGLImageWidget.h
	M			plugins/dockers/smallcolorselector/KisGLImageWidget.cpp
	M			plugins/dockers/smallcolorselector/KisGLImageWidget.h
	M			plugins/dockers/smallcolorselector/kis_small_color_widget.cc