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 7cb2cffa)

SwissTopo redirects from the published URL.

plasma/plasma-desktop!756 makes
use of that.

(cherry picked from commit a9999ba4)

If a QObject is on the stack or global, sooner or later the
program will crash. We should use heap memory allocation for MainWindow,
so marble will not crash on exit.

BUG: 443144

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 case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

ivan tkachenko authored Sep 28, 2021 and Alexander Lohnau committed Oct 19, 2021

In order to do that, cmake_minimum_required had to be slightly updated.

* Global menu item fixed again
* Fix a item reference
* Renew some screenshots

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"

* Add @title:window helpers
* Capitalization and punctuation

* Add i18n-ksirkskineditor entity
* GUI sync:
  - Review
  - Add Plugins from configuration dialog
* Improve a title
* Use suitable tags
* GUI sync and shortcut fixes:
  - View -> Refresh
  - Add Bookmarks menu items

ivan tkachenko authored Sep 29, 2021 and Heiko Becker committed Oct 05, 2021

STATUS_NO_FIX was renamed to STATUS_UNK.

https://gitlab.com/gpsd/gpsd/-/commit/d4a4d8d3606fd50f10bcd20096a8a0cdb8b2d427

Co-Authored-By: Vlad Zahorodnii <vlad.zahorodnii@kde.org>

LICENSE.txt is a symlink, but it gets installed as a symlink (not as a
file, as INSTALL copies symlinks as symlinks) to the
license in LICENSES/, which is not installed. Therefore build systems
that watch for files that are not installed will notice a symlink
pointing to a location in the source and not on the target path and will
error out.

Having INSTALL handle symlinks is tricky, so the best solution is to
just install the actual file in LICENSES and rename it.

Otherwise it is not a valid XML file. Please see also:
https://community.kde.org/Guidelines_and_HOWTOs/Licensing#XML_Files_.28appdata.xml.2C_.2A.qrc.29

CCMAIL: alexander.lohnau@gmx.de