diff options
| author | Sune Vuorela <sune@vuorela.dk> | 2013-12-07 21:19:50 +0100 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2013-12-09 22:18:03 +0100 |
| commit | d21210934f1a150c38a1d12ae13ec177550735da (patch) | |
| tree | 78cf91428ade97d20046b8f141fb4b40fb3f7e3c | |
| parent | fd97e70698295d5b226ddb0cfc2cac589b404e5f (diff) | |
Always ensure that the hardcoded paths are found
Practice has shown that quite many sets XDG dirs for various purposes
and that spoils qtchooser finding the distro provided Qt without adding
like /usr to the XDG dirs variable which kind of kills performance.
Provide a dedicated variable to disable a global installation.
Change-Id: I58953e3b2b3cf43cb67d4c367312e83cfa9ad2b3
Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | src/qtchooser/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qtchooser/main.cpp b/src/qtchooser/main.cpp index ed1ee8f..e2a1c11 100644 --- a/src/qtchooser/main.cpp +++ b/src/qtchooser/main.cpp @@ -282,7 +282,7 @@ vector<string> ToolWrapper::searchPaths() const paths.insert(paths.end(), xdgPaths.begin(), xdgPaths.end()); #if defined(QTCHOOSER_GLOBAL_DIR) - if (qgetenv("XDG_CONFIG_DIRS").empty()) { + if (qgetenv("QTCHOOSER_NO_GLOBAL_DIR").empty()) { vector<string> globalPaths = stringSplit(QTCHOOSER_GLOBAL_DIR); paths.insert(paths.end(), globalPaths.begin(), globalPaths.end()); } |