diff options
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/defaults.js | 17 | ||||
| -rw-r--r-- | qbs/pluginspec/pluginspec.qbs | 15 |
2 files changed, 18 insertions, 14 deletions
diff --git a/qbs/defaults.js b/qbs/defaults.js new file mode 100644 index 00000000000..b486888e902 --- /dev/null +++ b/qbs/defaults.js @@ -0,0 +1,17 @@ +function testsEnabled(qbs) +{ + return qbs.getenv("TEST") || qbs.buildVariant === "debug"; +} + +function defines(qbs) +{ + var list = [ + 'IDE_LIBRARY_BASENAME="lib"', + "QT_DISABLE_DEPRECATED_BEFORE=0x040900", + "QT_NO_CAST_TO_ASCII", + "QT_NO_CAST_FROM_ASCII" + ] + if (testsEnabled(qbs)) + list.push("WITH_TESTS") + return list +} diff --git a/qbs/pluginspec/pluginspec.qbs b/qbs/pluginspec/pluginspec.qbs index dea785fe29c..9e7861f0169 100644 --- a/qbs/pluginspec/pluginspec.qbs +++ b/qbs/pluginspec/pluginspec.qbs @@ -9,27 +9,14 @@ 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: product.destination - property var pluginspecreplacements: product.pluginspecreplacements - - FileTagger { - pattern: "*.in" - fileTags: ["pluginSpecIn"] - } - Rule { inputs: ["pluginSpecIn"] Artifact { fileTags: ["pluginSpec"] - fileName: { - var destdir = input.modules.pluginspec.destdir; - if (!destdir.match(/\/$/)) - destdir += "/"; - return destdir + input.fileName.replace(/\.[^\.]*$/,''); - } + fileName: input.fileName.replace(/\.[^\.]*$/,'') } prepare: { |