aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/blackbox/tst_clangdb.cpp
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@qt.io>2017-11-30 08:20:52 -0800
committerJake Petroules <jake.petroules@qt.io>2017-12-01 19:52:47 +0000
commitcf2116b63a052bfcd7546bec56f66a5015cf5c51 (patch)
treecc2b0ce1c642570c8a76fe9bdf2c2f3285c9217a /tests/auto/blackbox/tst_clangdb.cpp
parent983caefa5b7fc8dc40bf620bd75c21d9f07c1573 (diff)
Make Version a public class
It's already exposed in public API; i.e. via qtprofilesetup headers. Change-Id: I56950ce3163e6c5bd2c3fd08cc885b35723be5a7 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'tests/auto/blackbox/tst_clangdb.cpp')
-rw-r--r--tests/auto/blackbox/tst_clangdb.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/auto/blackbox/tst_clangdb.cpp b/tests/auto/blackbox/tst_clangdb.cpp
index b1b03dbc3..566082211 100644
--- a/tests/auto/blackbox/tst_clangdb.cpp
+++ b/tests/auto/blackbox/tst_clangdb.cpp
@@ -46,7 +46,6 @@
using qbs::InstallOptions;
using qbs::Internal::HostOsInfo;
-using qbs::Internal::Version;
int TestClangDb::runProcess(const QString &exec, const QStringList &args, QByteArray &stdErr,
QByteArray &stdOut)
@@ -78,15 +77,15 @@ int TestClangDb::runProcess(const QString &exec, const QStringList &args, QByteA
return process.exitStatus() == QProcess::NormalExit ? process.exitCode() : -1;
}
-Version TestClangDb::clangVersion()
+qbs::Version TestClangDb::clangVersion()
{
QByteArray stdErr;
QByteArray stdOut;
if (runProcess("clang-check", QStringList("--version"), stdErr, stdOut) != 0)
- return Version();
+ return qbs::Version();
stdOut.remove(0, stdOut.indexOf("LLVM version ") + 13);
stdOut.truncate(stdOut.indexOf('\n'));
- return Version::fromString(QString::fromLocal8Bit(stdOut));
+ return qbs::Version::fromString(QString::fromLocal8Bit(stdOut));
}
@@ -195,7 +194,7 @@ void TestClangDb::checkClangDetectsSourceCodeProblems()
// Older clang versions do not support the "arguments" array in the compilation database.
// Should we really want to support them, we would have to fall back to "command" instead.
- if (clangVersion() < Version(3, 7))
+ if (clangVersion() < qbs::Version(3, 7))
QSKIP("This test requires clang-check to be based on at least LLVM 3.7.0.");
// clang-check.exe does not understand MSVC command-line syntax