diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-03-15 10:13:56 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-03-15 10:13:56 +0100 |
| commit | 72f4a0051549907f9ea335ce773889ac8d159243 (patch) | |
| tree | 7930c83e3fd86d1239df1a09bd006a9951e929cd /share | |
| parent | cfe33211cc48199b2b69ac37972d58d5d141ef07 (diff) | |
| parent | 2c0962017e24574b3d92599229384b2e7beb1794 (diff) | |
Merge 1.11 into master
Change-Id: I15cdc5c73a13c36cf073d01aff0406e539bb507b
Diffstat (limited to 'share')
| -rw-r--r-- | share/qbs/modules/cpp/setuprunenv.js | 7 | ||||
| -rw-r--r-- | share/qbs/modules/vcs/vcs-module.qbs | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/share/qbs/modules/cpp/setuprunenv.js b/share/qbs/modules/cpp/setuprunenv.js index dcbe5b273..dfc30d20c 100644 --- a/share/qbs/modules/cpp/setuprunenv.js +++ b/share/qbs/modules/cpp/setuprunenv.js @@ -57,13 +57,6 @@ function addExternalLibPath(product, list, path) function gatherPaths(product, libPaths, frameworkPaths) { - // Heuristic: If any rpaths are set, assume environment paths should not be set up. - // Let's not try to be super fancy, evaluating all the rpaths, expanding $ORIGIN, relative paths - // and whatnot. - if (!product.qbs.targetOS.contains("windows") && product.cpp && product.cpp.useRPaths - && product.cpp.rpaths && product.cpp.rpaths.length > 0) - return; - // Gather explicitly given library paths. if (product.cpp && product.cpp.libraryPaths) product.cpp.libraryPaths.forEach(function(p) { addExternalLibPath(product, libPaths, p); }); diff --git a/share/qbs/modules/vcs/vcs-module.qbs b/share/qbs/modules/vcs/vcs-module.qbs index 290547713..a56eb3b49 100644 --- a/share/qbs/modules/vcs/vcs-module.qbs +++ b/share/qbs/modules/vcs/vcs-module.qbs @@ -51,6 +51,8 @@ Module { found = true; type = "git"; metaDataBaseDir = detector.readStdOut().trim(); + if (!FileInfo.isAbsolutePath(metaDataBaseDir)) + metaDataBaseDir = FileInfo.joinPaths(theRepoDir, metaDataBaseDir); return; } if (detector.exec(tool || "svn", |