From 50373acdaf8ecd56d9fc0b31ee2f8f06f448c1a3 Mon Sep 17 00:00:00 2001 From: Andrea Scarpino Date: Mon, 15 Apr 2013 23:19:39 +0200 Subject: [PATCH] Give home configurations precedence over system ones Change-Id: Ib0c4cf47c0ff5f716949cc5653ba27dad3558489 Reviewed-by: Thiago Macieira --- src/qtchooser/main.cpp | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/qtchooser/main.cpp b/src/qtchooser/main.cpp index da54b16..514503d 100644 --- a/src/qtchooser/main.cpp +++ b/src/qtchooser/main.cpp @@ -272,12 +272,13 @@ vector ToolWrapper::searchPaths() const { vector paths; - // search the XDG config location directories - paths = stringSplit(qgetenv("XDG_CONFIG_DIRS", "/etc/xdg").c_str()); - string localDir = qgetenv("XDG_CONFIG_HOME", userHome() + PATH_SEP ".config"); paths.push_back(localDir); + // search the XDG config location directories + vector xdgPaths = stringSplit(qgetenv("XDG_CONFIG_DIRS", "/etc/xdg").c_str()); + paths.insert(paths.end(), xdgPaths.begin(), xdgPaths.end()); + for (vector::iterator it = paths.begin(); it != paths.end(); ++it) *it += "/qtchooser/"; -- 1.7.1