Merge remote-tracking branch 'origin/Applications/17.12'

Conflicts:
	CMakeLists.txt [versions]
	src/panels/places/placesitemmodel.cpp

1 files changed, 9 insertions, 1 deletions

diff --git a/src/panels/folders/folderspanel.h b/src/panels/folders/folderspanel.h
index 75a603681..f67c19cbb 100644
--- a/src/panels/folders/folderspanel.h
+++ b/src/panels/folders/folderspanel.h
@@ -86,11 +86,19 @@ private slots:
 
 private:
     /**
+     * Indicate if it is allowed to leave current location.
+     */
+    enum NavigationBehaviour {
+      StayWhereYouAre,  ///< Don't leave current location.
+      AllowJumpHome     ///< Go Home only when context menu option got checked.
+    };
+    /**
      * Initializes the base URL of the tree and expands all
      * directories until \a url.
      * @param url  URL of the leaf directory that should get expanded.
+     * @param navigationBehaviour Navigation behaviour \see NavigationBehaviour
      */
-    void loadTree(const QUrl& url);
+    void loadTree(const QUrl& url, NavigationBehaviour navigationBehaviour = StayWhereYouAre);
 
     void reloadTree();