GitLab

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

(cherry picked from commit e585d50f012595a6449e1a65a272054e3d678913)

Since we use partial updates now, we should handle WA mode properly

BUG:427427

This adds the possibility to clear the color history from the popup palette.

NDK couldn't find the right one.


(cherry picked from commit 7de2b888)

This commit replaces the shared buffer, transforms, and mutex with
a stack-local buffer and two lockless stacks for fromQColor and
toQColor.

This also fixes transforms not being properly destroyed through
cmsDeleteTransform.

CCMAIL: kimageshop@kde.org
(cherry picked from commit 363dbb38)

This is why I do not want auto to be used in Krita's code:

auto bla = createSomething();

doesn't warn that you need to delete bla as much as

Bla *bla = createSomething();

because it's invisible that bla is a pointer.

The alternative is that we use smart pointers _everywhere_, which
isn't feasible...

CCMAIL:kimageshop@kde.org
CID:305464

The hack I wrote was incomplete and dirty. We already have
a great mechnism for kinetic scrolling.

BUG:423279
BUG:421997


(cherry picked from commit 993aab3c)

Report from KA:
https://krita-artists.org/t/preview-bug-for-mypaint-color-selector-and-minimal-color-selector/

This fixes subtract and multiply alpha modes for brush textures when the
texture file has an alpha channel.  Also fixes gradient map mode so it
respects alpha in textures that have it.

BUG:427153

# Conflicts:
#	plugins/paintops/libpaintop/kis_texture_option.cpp

(cherry picked from commit 7cd9bc90569cb2302c203ad70307d9adef800acd)

Remove the compiler label; it's not filled in. And add a text
edit field with the combined sysinfo, log and crash log files,
and place the contents on the clipboard for easy pasting.

It's a pity we cannot use the bugzilla REST api to automatically
add these files as an attachment.

From now on, we can simply ask people to report bugs using the
dialog and add this information.

CCMAIL:kimageshop@kde.org
(cherry picked from commit 31b00a47)

BUG:427402


(cherry picked from commit 3f7272aa)

Previously, File Layers made by dragging and dropping image where named
"File Layer <number>"; which isn't very meaningful. This commit names
Drag and Drop'd file layers by the name and format of the file.
i.e. "example.jpg"

BUG:427235

When preview stroke adds a set of jobs, this set should never
intersect with the previous update jobs. Otherwise there will
be crash.

BUG:427199

On android the selection action's text includes the
accelerators. When the config is read, the corresponding
text (which includes accelerators) is invalid hence no
items are shown.

BUG:425344

BUG:427094

asf is full path to the directory not just the name.
We don't want Unix path and content Uri to be concatenated
on Android.


(cherry picked from commit 66086907)

Update FindQuaZip to find the QuaZip 1.0 library names and include dirs. Once support for quazip<1 is dropped this should be ported to use quazip's own QuaZipConfig

Previous commit inserted ZoomToHeightShortcut after ZoomToWidthShortcut
in Shortcuts enum. This result in RelativeZoomModeShortcut's
combinations to shortcut to "Fit Page Height" instead.

Fixed by moving ZoomToHeightShortcut to end of enum.

BUG:410929

Added Fit to Height option in zoom drop-down, and ability to shortcut
via "Configure Krita..." Set ZOOM_HEIGHT enum value to 16,
so ZOOM_HEIGHT is a unique mask in KoZoomController::Private
(see KoZoomController_p.h line 41)

This commit resolves: https://bugs.kde.org/show_bug.cgi?id=410929

BUG:410929

(cherry picked from commit b38d827e)

For reasons that I couldn't properly understand.
dynamic_cast would fail on Android because the type_info*
would point to two separate locations in two separate
DSOs.
By making a strong symbol, we'll have one and only one
location to point to, which fixes the issue.

BUG:423196

(cherry picked from commit f87e30ca)

There are just too many sloppy profiles out there... See

https://forum.kde.org/viewtopic.php?f=139&t=168113&p=438107#p438107

When the scale crosses the zero value, the algorithm could behave
in a less stable way. To overcome this issue, for the reference value
we shouldn't use any distance term. Instead we should calculate the
expected position for the moved point and pass it to the algorithm
explicitly.

BUG:426949

Sometimes the algorithm converges to a false point, even though error
walue is still hight. It makes the transformation bounding box jump
from place to place. Just ignore this transformation if the solution
has not been found.

CCBUG:426949

According to Boud, there is no mainWindow once the application gets
created.

Used/changed the parent qApp->activeWindow() to provide a more
polished user interface (final changes made)

Used/changed the parent qApp->activeWindow() to provide a more
polished user interface

Used/changed the parent qApp->activeWindow() to provide a more
polished user interface