Last commit made on 2019-07-23
Get this branch:
git clone -b albertvaka/qml-plugin-macro https://git.launchpad.net/kdeconnect-desktop

Branch merges

Branch information


Recent commits

8542e63... by albertvaka on 2019-07-23

Added macro to install a declarative plugin

0254a0a... by albertvaka on 2019-07-22

Try to fix windows build

22795c1... by albertvaka on 2019-07-22

Make qml apps run from build/bin

27d5fd0... by albertvaka on 2019-07-22

Bundle a QRC file instead of installing separate QML files

dedb4b1... by albertvaka on 2019-07-22

KF5_MIN_VERSION was being defined *after* being used

e812a31... by albertvaka on 2019-07-22

Remove the need to use qt5_wrap_cpp for moc generation

607b9a6... by Nicolas Fella <email address hidden> on 2019-07-22

Revert "Use ecm_qt_declare_logging_category"

It's missing stuff to work properly. Revert until I figured that out

This reverts commit 8a118a6fae5b83ed9ad66cc7c91d3de34e194a9f.

ecbe1ac... by Simon Redman on 2019-07-22

Change license string in About

We are GPLv3 since we use some Kaiden components

2544d9b... by Nicolas Fella <email address hidden> on 2019-07-22

Include KPeople properly

1141271... by l10n daemon script <email address hidden> on 2019-07-22

SVN_SILENT made messages (.desktop file) - always resolve ours

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"