Command-line frontend: Make plugin and search paths configurable.

Projects embedding qbs might put these somewhere else.

Task-number: QTCREATORBUG-12473
Change-Id: I13e1a1843586501bb3e17a314ccd11af6c25ee43
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

1 files changed, 4 insertions, 5 deletions

diff --git a/src/app/qbs/commandlinefrontend.cpp b/src/app/qbs/commandlinefrontend.cpp
index e24ad8677..1a958935c 100644
--- a/src/app/qbs/commandlinefrontend.cpp
+++ b/src/app/qbs/commandlinefrontend.cpp
@@ -118,8 +118,6 @@ void CommandLineFrontend::start()
 
         if (m_parser.showProgress())
             m_observer = new ConsoleProgressObserver;
-        const QString qbsRootPath = QDir::cleanPath(QCoreApplication::applicationDirPath()
-                                                   + QLatin1String("/../"));
         SetupProjectParameters params;
         params.setProjectFilePath(m_parser.projectFilePath());
         params.setIgnoreDifferentProjectFilePath(m_parser.force());
@@ -139,9 +137,10 @@ void CommandLineFrontend::start()
             if (profileName.isEmpty())
                 throw ErrorInfo(Tr::tr("No profile specified and no default profile exists."));
             const Preferences prefs(m_settings, profileName);
-            params.setSearchPaths(prefs.searchPaths(qbsRootPath));
-            params.setPluginPaths(prefs.pluginPaths(qbsRootPath
-                                                    + QLatin1String("/" QBS_LIBRARY_DIRNAME)));
+            params.setSearchPaths(prefs.searchPaths(QDir::cleanPath(QCoreApplication::applicationDirPath()
+                    + QLatin1String("/" QBS_RELATIVE_SEARCH_PATH))));
+            params.setPluginPaths(prefs.pluginPaths(QDir::cleanPath(QCoreApplication::applicationDirPath()
+                    + QLatin1String("/" QBS_RELATIVE_PLUGINS_PATH))));
             params.setTopLevelProfile(profileName);
             params.setBuildVariant(buildVariant);
             params.setBuildRoot(buildDirectory(profileName));