From kde-commits  Thu May 31 21:19:30 2018
From: Matthieu Gallien <null () kde ! org>
Date: Thu, 31 May 2018 21:19:30 +0000
To: kde-commits
Subject: [elisa/genericModel] src/qml: Merge branch 'master' into genericModel
Message-Id: <E1fOUyo-0001Rs-OZ () code ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=152780158414016

Git commit 3de1872e098152920c910361cfc9aedd49eeb892 by Matthieu Gallien.
Committed on 31/05/2018 at 21:19.
Pushed by mgallien into branch 'genericModel'.

Merge branch 'master' into genericModel

M  +1    -1    src/qml/ViewManager.qml

https://commits.kde.org/elisa/3de1872e098152920c910361cfc9aedd49eeb892

diff --cc src/qml/ViewManager.qml
index a30a3c5,8e03875..e76839f
--- a/src/qml/ViewManager.qml
+++ b/src/qml/ViewManager.qml
@@@ -55,9 -49,7 +55,9 @@@ QtObject =

      signal switchAllArtistsView()
      signal switchOneArtistView(var currentStackView, string mainTitle, ur=
l imageUrl, string secondaryTitle, int databaseId)
      signal switchAllTracksView()
 +    signal switchAllGenresView()
-     signal switchOffAllViews()
 +    signal switchAllArtistsFromGenreView(var currentStackView, string gen=
reName)
+     signal switchOffAllViews()
  =

      function closeAllViews()
      {