From f1c299a85e08c5ce16fc8dad371a11115687edf0 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgads@gmail.com>
Date: Thu, 5 Apr 2012 06:32:36 +0300
Subject: [PATCH] Qbs: Allow provider specification for plugins
Change-Id: I2016da500a9e81d8b2065c4c1c26a15d59c15abf
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
---
qbs/pluginspec/pluginspec.qbs | 2 +-
src/plugins/QtcPlugin.qbs | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/qbs/pluginspec/pluginspec.qbs b/qbs/pluginspec/pluginspec.qbs
index 6b7122d6058..9b186e74749 100644
--- a/qbs/pluginspec/pluginspec.qbs
+++ b/qbs/pluginspec/pluginspec.qbs
@@ -7,7 +7,7 @@ Module {
property int ide_version_minor: project.ide_version_minor
property int ide_version_release: project.ide_version_release
property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release
- property string destdir: "lib/qtcreator/plugins/Nokia/"
+ property string destdir: product.destination
FileTagger {
pattern: "*.in"
diff --git a/src/plugins/QtcPlugin.qbs b/src/plugins/QtcPlugin.qbs
index e34a7bcd546..da48870f3bb 100644
--- a/src/plugins/QtcPlugin.qbs
+++ b/src/plugins/QtcPlugin.qbs
@@ -3,7 +3,8 @@ import qbs.fileinfo 1.0 as FileInfo
Product {
type: ["dynamiclibrary", "pluginSpec"]
- destination: "lib/qtcreator/plugins/Nokia"
+ property string provider: 'Nokia'
+ destination: "lib/qtcreator/plugins/" + provider
targetName: {
// see PluginSpecPrivate::loadLibrary()
if (qbs.debugInformation) {
--
GitLab