From c8d0ba865196b1ce4955f671927969f0354a8b1c Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@theqtcompany.com>
Date: Tue, 3 May 2016 16:01:38 +0200
Subject: [PATCH] QbsProjectManager: Use IDE_LIBRARY_BASENAME to locate qbs'
 plugins.

This is a better try than hardcoding "lib" and likely to be correct in
real-world scenarios.

Change-Id: I380989b2d2c8389718bde941e081755f41be7f0c
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
---
 src/plugins/qbsprojectmanager/qbsprojectparser.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/plugins/qbsprojectmanager/qbsprojectparser.cpp b/src/plugins/qbsprojectmanager/qbsprojectparser.cpp
index e4fc351edf1..af53e1bce80 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectparser.cpp
+++ b/src/plugins/qbsprojectmanager/qbsprojectparser.cpp
@@ -206,8 +206,12 @@ QString QbsProjectParser::libExecDirectory() const
 QString QbsProjectParser::pluginsBaseDirectory() const
 {
     const QString qbsInstallDir = QLatin1String(QBS_INSTALL_DIR);
+
+    // Note: We assume here that Qt Creator and qbs use the same name for their library dir.
+    const QString qbsLibDirName = QLatin1String(IDE_LIBRARY_BASENAME);
+
     if (!qbsInstallDir.isEmpty())
-        return qbsInstallDir + QLatin1String("/lib/");
+        return qbsInstallDir + QLatin1Char('/') + qbsLibDirName;
     if (HostOsInfo::isMacHost())
         return QDir::cleanPath(QCoreApplication::applicationDirPath()
                                + QLatin1String("/../PlugIns"));