diff options
| -rw-r--r-- | qbs/imports/QtcAutotest.qbs | 1 | ||||
| -rw-r--r-- | src/libs/ssh/ssh.qbs | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/qbs/imports/QtcAutotest.qbs b/qbs/imports/QtcAutotest.qbs index 36817c43e8..6606db7521 100644 --- a/qbs/imports/QtcAutotest.qbs +++ b/qbs/imports/QtcAutotest.qbs @@ -12,6 +12,7 @@ CppApplication { + FileInfo.relativePath(project.ide_source_tree, sourceDirectory) cpp.cxxFlags: QtcFunctions.commonCxxFlags(qbs) + cpp.linkerFlags: QtcFunctions.commonLinkerFlags(qbs) cpp.rpaths: [ buildDirectory + '/' + project.ide_library_path, buildDirectory + '/' + project.ide_library_path + "/..", // OSX diff --git a/src/libs/ssh/ssh.qbs b/src/libs/ssh/ssh.qbs index 6c22cabfec..64cdb55c91 100644 --- a/src/libs/ssh/ssh.qbs +++ b/src/libs/ssh/ssh.qbs @@ -109,12 +109,13 @@ QtcLibrary { // For Botan. Properties { condition: qbs.toolchain.contains("mingw") - cpp.cxxFlags: [ + cpp.cxxFlags: base.concat([ "-fpermissive", "-finline-functions", "-Wno-long-long" - ] + ]) } + cpp.cxxFlags: base Export { Depends { name: "Qt"; submodules: ["widgets", "network"] } |