diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-09-17 10:28:19 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-09-17 10:28:19 +0200 |
| commit | 5ad724c61bc78cad19b265b177635c1e48bcbbaf (patch) | |
| tree | 53d7e9467d0b62396535224b9d89866ae4509d23 /tests/auto | |
| parent | 0d185a0ad3f3efc2690356c7567d8351827deb88 (diff) | |
| parent | 364288b79cfb27f4bea9a7a41b785660fb8d0dde (diff) | |
Merge remote-tracking branch 'origin/4.13' into master
Conflicts:
src/plugins/qmakeprojectmanager/qmakeproject.cpp
Change-Id: Ieb1c3e946f11d3c4fa1ee6b5afdf83cc532d8aed
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/debugger/tst_dumpers.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp index 593419ecc6..4849508430 100644 --- a/tests/auto/debugger/tst_dumpers.cpp +++ b/tests/auto/debugger/tst_dumpers.cpp @@ -1226,6 +1226,7 @@ void tst_Dumpers::initTestCase() m_debuggerVersion = ba.toInt(); if (!m_debuggerVersion) { if (output.startsWith("lldb version")) { + output = output.split('\n')[0]; // drop clang/llvm version int pos1 = output.indexOf('.', 13); int major = output.mid(13, pos1++ - 13).toInt(); int pos2 = output.indexOf(' ', pos1); |