From b99755fdb0c199f4f5d89efe64ad683ccee5c782 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 7 Feb 2018 12:37:55 +0100 Subject: Version bump to 4.6-rc1 Change-Id: I87c6a2452ad5ef86eb3146373a11124f3a199b32 Reviewed-by: Eike Ziller --- qbs/modules/qtc/qtc.qbs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'qbs') diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs index 9a669ccfc0..e637ce8111 100644 --- a/qbs/modules/qtc/qtc.qbs +++ b/qbs/modules/qtc/qtc.qbs @@ -4,16 +4,16 @@ import qbs.FileInfo import "qtc.js" as HelperFunctions Module { - property string qtcreator_display_version: '4.6.0-beta1' + property string qtcreator_display_version: '4.6.0-rc1' property string ide_version_major: '4' property string ide_version_minor: '5' - property string ide_version_release: '82' + property string ide_version_release: '83' property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release property string ide_compat_version_major: '4' property string ide_compat_version_minor: '5' - property string ide_compat_version_release: '82' + property string ide_compat_version_release: '83' property string qtcreator_compat_version: ide_compat_version_major + '.' + ide_compat_version_minor + '.' + ide_compat_version_release -- cgit v1.2.1 From ae20deb3a7286972b4b4f250f9d6a5fd841c8c68 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 8 Feb 2018 16:37:54 +0100 Subject: qbs build: Use project-global destination dir for libs and plugins The autotests' rpath settings expect them there. Change-Id: I13e3b8fb9a65be16e980b8465ff2e89b9e01ec6b Reviewed-by: Nikolai Kosjar Reviewed-by: Joerg Bornemann --- qbs/imports/QtcLibrary.qbs | 2 +- qbs/imports/QtcPlugin.qbs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'qbs') diff --git a/qbs/imports/QtcLibrary.qbs b/qbs/imports/QtcLibrary.qbs index faa3900a99..8ea8a6d2df 100644 --- a/qbs/imports/QtcLibrary.qbs +++ b/qbs/imports/QtcLibrary.qbs @@ -13,7 +13,7 @@ QtcProduct { } targetName: QtcFunctions.qtLibraryName(qbs, name) - destinationDirectory: FileInfo.joinPaths(buildDirectory, qtc.ide_library_path) + destinationDirectory: FileInfo.joinPaths(project.buildDirectory, qtc.ide_library_path) cpp.linkerFlags: { var flags = base; diff --git a/qbs/imports/QtcPlugin.qbs b/qbs/imports/QtcPlugin.qbs index 95198a62ef..7606b02504 100644 --- a/qbs/imports/QtcPlugin.qbs +++ b/qbs/imports/QtcPlugin.qbs @@ -13,7 +13,7 @@ QtcProduct { property var pluginTestDepends: [] targetName: QtcFunctions.qtLibraryName(qbs, name) - destinationDirectory: FileInfo.joinPaths(buildDirectory, qtc.ide_plugin_path) + destinationDirectory: FileInfo.joinPaths(project.buildDirectory, qtc.ide_plugin_path) Depends { name: "ExtensionSystem" } Depends { name: "pluginjson" } -- cgit v1.2.1