diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2014-05-07 22:53:38 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2014-05-08 15:29:11 +0200 |
| commit | 6aad96d89b5cd4f8b7e06b72cf911054c5d89037 (patch) | |
| tree | beefc75034dd64590ede3cc20d88e25219cdb7e7 /qbs | |
| parent | aa52cfa0e6745d517b11c85a013a35f9712257f5 (diff) | |
| download | qt-creator-6aad96d89b5cd4f8b7e06b72cf911054c5d89037.tar.gz | |
Nuke plugins PROVIDER settings
Place all plugins in lib/qtcreator/plugins
Change-Id: I66606910104b28d91038f5607850ce03bdd1b80f
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/imports/QtcAutotest.qbs | 4 | ||||
| -rw-r--r-- | qbs/imports/QtcPlugin.qbs | 11 |
2 files changed, 7 insertions, 8 deletions
diff --git a/qbs/imports/QtcAutotest.qbs b/qbs/imports/QtcAutotest.qbs index 6606db7521..2320c859ae 100644 --- a/qbs/imports/QtcAutotest.qbs +++ b/qbs/imports/QtcAutotest.qbs @@ -16,7 +16,7 @@ CppApplication { cpp.rpaths: [ buildDirectory + '/' + project.ide_library_path, buildDirectory + '/' + project.ide_library_path + "/..", // OSX - buildDirectory + '/' + project.ide_plugin_path + "/QtProject" + buildDirectory + '/' + project.ide_plugin_path ] // The following would be conceptually right, but does not work currently as some autotests @@ -25,7 +25,7 @@ CppApplication { // cpp.rpaths: qbs.targetOS.contains("osx") // ? ["@executable_path/.."] // : ["$ORIGIN/../" + project.libDirName + "/qtcreator", -// "$ORIGIN/../" project.libDirName + "/qtcreator/plugins/QtProject"] +// "$ORIGIN/../" project.libDirName + "/qtcreator/plugins"] // Group { // fileTagsFilter: product.type // qbs.install: true diff --git a/qbs/imports/QtcPlugin.qbs b/qbs/imports/QtcPlugin.qbs index 638891e501..3d0d7471a4 100644 --- a/qbs/imports/QtcPlugin.qbs +++ b/qbs/imports/QtcPlugin.qbs @@ -4,7 +4,6 @@ import QtcFunctions Product { type: ["dynamiclibrary", "pluginSpec"] - property string provider: 'QtProject' property var pluginspecreplacements property var pluginRecommends: [] @@ -13,7 +12,7 @@ Product { condition: QtcFunctions.versionIsAtLeast(Qt.core.version, minimumQtVersion) targetName: QtcFunctions.qtLibraryName(qbs, name) - destinationDirectory: project.ide_plugin_path + '/' + provider + destinationDirectory: project.ide_plugin_path Depends { name: "ExtensionSystem" } Depends { name: "pluginspec" } @@ -24,9 +23,9 @@ Product { } cpp.defines: project.generalDefines.concat([name.toUpperCase() + "_LIBRARY"]) - cpp.installNamePrefix: "@rpath/PlugIns/" + provider + "/" - cpp.rpaths: qbs.targetOS.contains("osx") ? ["@loader_path/../..", "@executable_path/.."] - : ["$ORIGIN", "$ORIGIN/..", "$ORIGIN/../.."] + cpp.installNamePrefix: "@rpath/PlugIns/" + cpp.rpaths: qbs.targetOS.contains("osx") ? ["@loader_path/..", "@executable_path/.."] + : ["$ORIGIN", "$ORIGIN/.."] cpp.cxxFlags: QtcFunctions.commonCxxFlags(qbs) cpp.linkerFlags: { var flags = QtcFunctions.commonLinkerFlags(qbs); @@ -56,7 +55,7 @@ Product { Group { fileTagsFilter: product.type qbs.install: true - qbs.installDir: project.ide_plugin_path + "/" + provider + qbs.installDir: project.ide_plugin_path } Export { |