blob: d9575e9376075064a3af324a7bb4d6a031c4b27a (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
From 50373acdaf8ecd56d9fc0b31ee2f8f06f448c1a3 Mon Sep 17 00:00:00 2001
From: Andrea Scarpino <andrea@archlinux.org>
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 <thiago.macieira@intel.com>
---
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<string> ToolWrapper::searchPaths() const
{
vector<string> 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<string> xdgPaths = stringSplit(qgetenv("XDG_CONFIG_DIRS", "/etc/xdg").c_str());
+ paths.insert(paths.end(), xdgPaths.begin(), xdgPaths.end());
+
for (vector<string>::iterator it = paths.begin(); it != paths.end(); ++it)
*it += "/qtchooser/";
--
1.7.1
|
