summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
authorIvan Donchevskii <ivan.donchevskii@qt.io>2019-04-04 14:50:10 +0200
committerIvan Donchevskii <ivan.donchevskii@qt.io>2019-04-17 12:13:36 +0000
commit53c407bc0c87e0b65b537bf26836ddd8e00ead82 (patch)
treeda77b44917da23671362896cd5b46edcb41ca37d /src/shared
parentdb89e78c631df204181df3173d18ecb4a6e6164b (diff)
downloadqt-creator-53c407bc0c87e0b65b537bf26836ddd8e00ead82.tar.gz
Clang: Fix build with clang-8
Clang-Tidy checks and Clazy flags updated. CLANG-UPGRADE-CHECK done. Change-Id: I1ca585c5c3c77a7f183719df9c262603150914e8 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/clang/clang_installation.pri10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri
index 107604a08b..5352624672 100644
--- a/src/shared/clang/clang_installation.pri
+++ b/src/shared/clang/clang_installation.pri
@@ -141,15 +141,15 @@ win32: BIN_EXTENSION = .exe
isEmpty(LLVM_INSTALL_DIR) {
unix {
- llvm_config = $$system(which llvm-config-7)
+ llvm_config = $$system(which llvm-config-8)
}
isEmpty(llvm_config) {
llvm_config = llvm-config
}
} else {
- exists($$LLVM_INSTALL_DIR/bin/llvm-config-7$$BIN_EXTENSION) {
- llvm_config = $$system_quote($$LLVM_INSTALL_DIR/bin/llvm-config-7)
+ exists($$LLVM_INSTALL_DIR/bin/llvm-config-8$$BIN_EXTENSION) {
+ llvm_config = $$system_quote($$LLVM_INSTALL_DIR/bin/llvm-config-8)
} else {
llvm_config = $$system_quote($$LLVM_INSTALL_DIR/bin/llvm-config)
requires(exists($$llvm_config$$BIN_EXTENSION))
@@ -163,10 +163,10 @@ isEmpty(LLVM_VERSION) {
$$llvmWarningOrError(\
"Cannot determine clang version. Set LLVM_INSTALL_DIR to build the Clang Code Model",\
"LLVM_INSTALL_DIR does not contain a valid llvm-config, candidate: $$llvm_config")
-} else:!versionIsAtLeast($$LLVM_VERSION, 7, 0, 0): {
+} else:!versionIsAtLeast($$LLVM_VERSION, 8, 0, 0): {
# CLANG-UPGRADE-CHECK: Adapt minimum version numbers.
$$llvmWarningOrError(\
- "LLVM/Clang version >= 7.0.0 required, version provided: $$LLVM_VERSION")
+ "LLVM/Clang version >= 8.0.0 required, version provided: $$LLVM_VERSION")
LLVM_VERSION =
} else {
# CLANG-UPGRADE-CHECK: Remove suppression if this warning is resolved.