aboutsummaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorIvan Komissarov <ABBAPOH@gmail.com>2019-04-18 18:55:25 +0200
committerIvan Komissarov <ABBAPOH@gmail.com>2019-04-23 18:53:43 +0000
commit21968aed886e45c0514a2b770bc678c07a204d89 (patch)
tree1b40482172ac70dcadc914f7baab15a51022c957 /share
parentb8724729191957066ce19786d6de9ee9ccf045e8 (diff)
Fix tests on non-latin systems
Qt Creator uses non-latin letters in path to the build directory in case of ru_RU.UTF-8 $LANG on Linux. Now QBS does handle that correctly. Change-Id: Ifc727b120a5f0ee60972c5e3ed24067426db8df2 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share')
-rw-r--r--share/qbs/modules/cpp/GenericGCC.qbs3
1 files changed, 3 insertions, 0 deletions
diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs
index b4e755a3e..f9537884e 100644
--- a/share/qbs/modules/cpp/GenericGCC.qbs
+++ b/share/qbs/modules/cpp/GenericGCC.qbs
@@ -729,6 +729,9 @@ CppModule {
match = regexp.exec(linkerScript.readLine());
if(match) {
var additionalPath = match[1];
+ // path can be quoted to use non-latin letters, remove quotes if present
+ if (additionalPath.startsWith("\"") && additionalPath.endsWith("\""))
+ additionalPath = additionalPath.slice(1, additionalPath.length - 1);
retval.push(additionalPath);
}
}