diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2016-11-16 16:04:59 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2016-11-16 16:04:59 +0100 |
| commit | 4026864f38488d40c5bf11310f8192b525373456 (patch) | |
| tree | 4fc1dcc6431259a950c91c2db2ed4fb1c77a6991 /src/shared | |
| parent | 6e17882bfc1c0ea5cc3f9e09ef8739b20153943e (diff) | |
| parent | 82818cb90bde1dcc4dd1fa6c0c2c9608e61429c2 (diff) | |
Merge remote-tracking branch 'origin/4.2'
Conflicts:
src/plugins/clangrefactoring/refactoringengine.cpp
src/tools/clangrefactoringbackend/source/symbolfinder.cpp
Change-Id: I7c1c87f3b8ade43a07f6668565501042e967fa8b
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/clang/clang_installation.pri | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri index ae8f359859..35474b8faa 100644 --- a/src/shared/clang/clang_installation.pri +++ b/src/shared/clang/clang_installation.pri @@ -97,8 +97,8 @@ LIBTOOLING_LIBS += $$CLANGTOOLING_LIBS $$LLVM_STATIC_LIBS contains(QMAKE_DEFAULT_INCDIRS, $$LLVM_INCLUDEPATH): LLVM_INCLUDEPATH = isEmpty(LLVM_VERSION): error("Cannot determine clang version at $$LLVM_INSTALL_DIR") -!versionIsAtLeast($$LLVM_VERSION, 3, 8, 0): { - error("LLVM/Clang version >= 3.8.0 required, version provided: $$LLVM_VERSION") +!versionIsAtLeast($$LLVM_VERSION, 3, 9, 0): { + error("LLVM/Clang version >= 3.9.0 required, version provided: $$LLVM_VERSION") } unix:LLVM_CXXFLAGS = -fno-rtti -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS |