diff options
| author | Michael Schuster <michael@schuster.ms> | 2020-03-01 08:47:46 +0300 |
|---|---|---|
| committer | Michael Schuster <michael@schuster.ms> | 2020-03-01 08:47:46 +0300 |
| commit | 712fef0cac6def8221c42f38b89be784e4d987ec (patch) | |
| tree | 95723fc2d27c7a707bcf021d60f86ec34f2e0076 /resources.qrc | |
| parent | 6593317afa50d6058b45a0afc501c9697a4a1db3 (diff) | |
| parent | 318c749558526395b25b68be5b86314e653cb010 (diff) | |
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>
Diffstat (limited to 'resources.qrc')
| -rw-r--r-- | resources.qrc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/resources.qrc b/resources.qrc new file mode 100644 index 000000000..6ea8bb8fc --- /dev/null +++ b/resources.qrc @@ -0,0 +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> |