Merge remote-tracking branch 'origin/4.13' into 4.14

Conflicts: src/shared/qbs Change-Id: If75741825f5788165f9bf2f0248e976811273b6a
2020-11-12 11:39:01 +01:00
parent 1e8ed5092d 524cad144a
commit 46d2046173
4 changed files with 110 additions and 11 deletions
@@ -36,7 +36,8 @@ import re

 if __name__ == '__main__':
    # qt.shiboken: (<module>) <file>:<line>:[<column>:] text
-    pattern = re.compile(r'^qt\.shiboken: \(([^)]+)\) ([^:]+):(\d+):(?:\d+:)? (.*)$')
+    # file might be c:\ on Windows
+    pattern = re.compile(r'^qt\.shiboken: \(([^)]+)\) (..[^:]+):(\d+):(?:\d+:)? (.*)$')
    while True:
        line = sys.stdin.readline()
        if not line: