From: Michael Schuster <michael@schuster.ms>
Date: Sun, 1 Mar 2020 05:47:46 +0000 (+0100)
Subject: Merge branch 'master' into qml-singleton-style and fix merge conflict
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~222^2^2~343^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=712fef0cac6def8221c42f38b89be784e4d987ec;p=nextcloud-desktop.git

Merge branch 'master' into qml-singleton-style and fix merge conflict

Migrate changes in client.qrc to resources.qrc

Signed-off-by: Michael Schuster <michael@schuster.ms>
---

712fef0cac6def8221c42f38b89be784e4d987ec
diff --cc resources.qrc
index 000000000,60e0f0a6e..6ea8bb8fc
mode 000000,100644..100644
--- a/resources.qrc
+++ b/resources.qrc
@@@ -1,0 -1,6 +1,8 @@@
+ <RCC>
+     <qresource prefix="/qml">
+         <file>src/gui/tray/Window.qml</file>
+         <file>src/gui/tray/UserLine.qml</file>
++        <file>theme/Style/Style.qml</file>
++        <file>theme/Style/qmldir</file>
+     </qresource>
+ </RCC>