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"

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"

Differential Revision: https://phabricator.kde.org/D28171

gps_data_t.fix.time is a struct timespec in gpsd>=3.20

Differential Revision: https://phabricator.kde.org/D26486

Ref T12071

Differential Revision: https://phabricator.kde.org/D25456

Differential Revision: https://phabricator.kde.org/D18124

Differential Revision: https://phabricator.kde.org/D26070

Summary:
KCM UI is gradually moving to Qt Quick Controls 2 components and Kirigami form layout. This can solve some layout consistency issue and HiDPI rendering issue (QQC1 doesn't render properly in HiDPI screen).

{F7779229}

Reviewers: #marble, #plasma, ngraham

Reviewed By: ngraham

Subscribers: ngraham, marble-devel, kde-edu

Tags: #marble, #kde_edu

Differential Revision: https://phabricator.kde.org/D25474

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"

Summary: This reworks the APK generation to be more aligned to what the binary factory Android builder expects. Most of the heavy lifting is done there for us, so we don't need special code for it here.

Test Plan: Builds in local clone of the binary factory container

Reviewers: #marble, sanjibanb

Reviewed By: sanjibanb

Subscribers: apol, marble-devel, kde-edu

Tags: #marble, #kde_edu

Differential Revision: https://phabricator.kde.org/D24642

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"

- Adding QML GeoItem and QML GeoPolyline.

Differential Revision: https://phabricator.kde.org/D23673

Previously, default styles would be constructed for every placemark.
Now create the default styles just once, then copy as required.

In addition, now display an icon for placemarks with points, but not for
lines or polygons.
Currently, the icon cannot be styled with the Simplestyle properties
"marker-size", "marker-symbol" or "marker-color":
this is yet to be implemented.

Differential Revision: https://phabricator.kde.org/D23533

FontAwesome icons are licensed under CC BY 4.0 and are
available from https://github.com/FortAwesome/Font-Awesome.git

The svgs/solid/dot-circle.svg from repository tag 5.10.2
(commit 090e6148d3f63a45b40e7cd8679bd4d64e58d75d) was used for this commit.

Differential Revision: https://phabricator.kde.org/D23532

Differential Revision: https://phabricator.kde.org/D23530

Differential Revision: https://phabricator.kde.org/D23529