From 52ec46a60fae6cfbcae51c30de7c66f1ac31597e Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Fri, 22 Feb 2019 10:37:36 +0100
Subject: [PATCH] Fix build of command-line qbs with qbs

The plugin path we pass as a define to the qbs sources contained the "/
qbs/plugins" suffix which qbs already adds itself. Therefore, the
command-line qbs was not functional.

Change-Id: I2bfb967f998e69bbe4da760a1f517e1f40e4f055
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs
index 845ce4139c6..4a0d6cab1d0 100644
--- a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs
+++ b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs
@@ -25,7 +25,7 @@ Module {
     property string relativeLibexecPath: FileInfo.relativePath('/' + appInstallDir,
                                                                '/' + libexecInstallDir)
     property string relativePluginsPath: FileInfo.relativePath('/' + appInstallDir,
-                                                               '/' + pluginsInstallDir)
+                                                               '/' + qtc.ide_plugin_path)
     property string relativeSearchPath: FileInfo.relativePath('/' + appInstallDir,
                                                               '/' + resourcesInstallDir)
 }