diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2014-07-16 13:34:55 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-07-16 14:02:19 +0200 |
| commit | cbeb77030fd41e55acd7ea9f310e6d601f5f5f84 (patch) | |
| tree | e879773931c3b284d9a4cfd2f24fc17d85223f5a /qbs | |
| parent | c5d34eb6b3825cf841340143ae61f4e8dddea0f3 (diff) | |
Autotests: Fix qbs build.
The semantic change in product.buildDirectory broke some autotests.
Change-Id: Ic9336f1e9341adacd1daa763b7ba729d7973fe58
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/imports/QtcAutotest.qbs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/qbs/imports/QtcAutotest.qbs b/qbs/imports/QtcAutotest.qbs index e05257e985..376c2f91c6 100644 --- a/qbs/imports/QtcAutotest.qbs +++ b/qbs/imports/QtcAutotest.qbs @@ -8,13 +8,13 @@ QtcProduct { targetName: "tst_" + name.split(' ').join("") // This needs to be absolute, because it is passed to one of the source files. - destinationDirectory: buildDirectory + '/' + destinationDirectory: project.buildDirectory + '/' + FileInfo.relativePath(project.ide_source_tree, sourceDirectory) cpp.rpaths: [ - buildDirectory + '/' + project.ide_library_path, - buildDirectory + '/' + project.ide_library_path + "/..", // OSX - buildDirectory + '/' + project.ide_plugin_path + project.buildDirectory + '/' + project.ide_library_path, + project.buildDirectory + '/' + project.ide_library_path + "/..", // OSX + project.buildDirectory + '/' + project.ide_plugin_path ] cpp.minimumOsxVersion: "10.7" cpp.defines: base.filter(function(d) { return d != "QT_NO_CAST_FROM_ASCII"; }) |