diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-07-31 12:20:13 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-07-31 12:20:13 +0200 |
| commit | 43ddde70dd61f9adb2c3b20ee86522494538ca0e (patch) | |
| tree | 18e6fca3eb8e2122f2dc273acc5f875d32ba3760 /qbs-resources | |
| parent | 92cf9460c46d707aeac02ef8f6597a4037df0964 (diff) | |
| parent | 33c9a2721b76e8a7affa19e924cbaf4e4c91060b (diff) | |
Merge branch 1.4 into master.
Change-Id: I2ff37ef7c00063f738f7691071c4b638dd2dc7c8
Diffstat (limited to 'qbs-resources')
| -rw-r--r-- | qbs-resources/imports/QbsLibrary.qbs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qbs-resources/imports/QbsLibrary.qbs b/qbs-resources/imports/QbsLibrary.qbs index 02c7fef66..4d05ea004 100644 --- a/qbs-resources/imports/QbsLibrary.qbs +++ b/qbs-resources/imports/QbsLibrary.qbs @@ -23,7 +23,7 @@ QbsProduct { Depends { name: "cpp" } Depends { name: "Qt"; submodules: ["core"] } cpp.rpaths: project.libRPaths - cpp.includePaths: "." + cpp.includePaths: [product.sourceDirectory] cpp.defines: product.type === "staticlibrary" ? ["QBS_STATIC_LIB"] : [] } } |