GitLab

GIT_SILENT

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"

In general actions need to start with verbs so that the user knows what
will happen. Changing "Actual Size" to "Zoom to Actual Size" makes the
action compliant with this rule, and also makes it clear that this is a
zoom action, so anywhere the user searches for the word "zoom", they
will find it.

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"

Plata Hill authored May 13, 2022 and Ahmad Samir committed May 13, 2022

example didn't compile

If $HOME isn't canonical (e.g. on FreeBSD it's /home/user while the
canonical path is /usr/home/user), replacing the canonical version of $HOME
with $HOME means that we'll read back a different value than we wrote
in.
It might seem "equivalent" but it leads to surprises like
KRecentDocuments showing duplicates because /usr/home/user became
/home/user in the KConfig roundtrip (but not in the XBEL roundtrip).

This commit loses the replacement of /usr/home/user with $HOME on
FreeBSD, but I think an exact roundtrip is what we expect, rather than
stuff being modified under our feet. The alternative would be to
canonicalize everything in KRecentDocuments but users don't want to
see the /usr in front, I assume (so we would have to use a cache of
canonicalized path, for the removal of duplicates, awful performance
wise).

This is a followup to commit 3c861a6c

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"

Task tracked at:
teams/frameworks-devs/kf6-workboard#2

This seems to be mostly for workspace-level notifications
(ex: color theme changed) which we don't really need on Windows.

We save time of last modification in seconds, so compare
only seconds. The incorrect comparison was introduced by
a6e83f97d255023a76c8e8c83a5363f949c6d346 in monolithic
kdelibs.

pyqt broke sip4 compatibility in 5.15.6, and there is no more maintainer
of the KF Python bindings to fix things.

Future support might need different code, so no advantage in keeping the
old code around.

This is basically the C++ counter-part to
!94
and allows to easily retrofit window size persistence on existing windows/
dialogs, replacing e.g. code like
https://invent.kde.org/pim/pimcommon/-/blob/master/src/pimcommon/widgets/kpimprintpreviewdialog.cpp.

This is a bit more complicated than one might expect, as KWindowConfig
works with QWindows, but that's something freshly created QWidget windows/
dialogs don't have yet. Additionally, we are in a library here that doesn't
depend on Qt::Widgets. To overcome this we move the widget-dependent code
(basically just a call to QWidget::windowHandle()) to inline template code
(and thus into the consumer), use std::function's type erasure to pass it
into the library code, and an event filter on the widget to wait for the
QWindow to become available.

Macros Q_NAMESPACE_EXPORT should be used without semicolon
https://doc.qt.io/qt-5/qobject.html#Q_NAMESPACE_EXPORT

This generates warning: extra ‘;’ [-Wpedantic]

This fixes the build with Qt6 on Android.

This has should be done explicitely, as the docs explain.

This causes issues for the KScreenLocker KCM port.

Rather than abort the build, don't create a session config
and print a warning.
Signed-off-by: Eike Hein <eike.hein@mbition.io>

Kai Uwe Broulik authored Feb 11, 2022 and Kai Uwe Broulik committed Feb 14, 2022

Rather than abort the build, don't create a session config
and print a warning.
Signed-off-by: Eike Hein <eike.hein@mbition.io>

Kai Uwe Broulik authored Feb 11, 2022 and Kai Uwe Broulik committed Feb 14, 2022

Signed-off-by: Eike Hein <eike.hein@mbition.io>

NO_CHANGELOG

NO_CHANGELOG

Since we are not building the library but the source files we
don't want the macro to expand to __declspec(dllimport).

It will trigger side effects like triggering the dbus signal
which depending on the timing may be delivered only in the next
test case causing an unexpected change signal emission.