feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Clang: Centralize -Wno-comment for GCC

Browse Source 
It's also needed in clangrefactoringbackend, unittest etc...

Change-Id: I9c758d52b34798d75610a4633bc7c5e7ceb0c00b
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Orgad Shaneh
2019-04-17 17:57:47 +03:00
committed by Orgad Shaneh
parent a35c5901ea
commit 8827d83115
4 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qbs/modules/libclang/libclang.qbs
+4 -1
View File
@@ -39,8 +39,11 @@ Module {
llvmToolingDefines = toolingParams.defines;
llvmToolingIncludes = toolingParams.includes;
llvmToolingCxxFlags = toolingParams.cxxFlags;
if (toolchain.contains("gcc"))
if (toolchain.contains("gcc")) {
llvmToolingCxxFlags.push("-Wno-unused-parameter");
// clang/Format/Format.h has intentional multiline comments
llvmToolingCxxFlags.push("-Wno-comment");
}
llvmFormattingLibs = ClangFunctions.formattingLibs(llvmConfig, QtcFunctions, targetOS);
found = llvmConfig && File.exists(llvmIncludeDir.concat("/clang-c/Index.h"));
}
src/plugins/clangformat/clangformat.pro
-2
View File
@@ -16,8 +16,6 @@ INCLUDEPATH += $$LLVM_INCLUDEPATH
QMAKE_CXXFLAGS_WARN_ON *= $$LLVM_CXXFLAGS_WARNINGS
QMAKE_CXXFLAGS *= $$LLVM_CXXFLAGS
# clang/Format/Format.h has intentional multiline comments
gcc:QMAKE_CXXFLAGS *= -Wno-comment
unix:!macos:QMAKE_LFLAGS += -Wl,--exclude-libs,ALL
SOURCES += \
src/plugins/clangformat/clangformat.qbs
+1 -6
View File
@@ -19,12 +19,7 @@ QtcPlugin {
&& libclang.llvmFormattingLibs.length
&& (!qbs.targetOS.contains("windows") || libclang.llvmBuildModeMatches)
cpp.cxxFlags: {
var res = base.concat(libclang.llvmToolingCxxFlags);
if (qbs.toolchain.contains("gcc"))
res.push("-Wno-comment"); // clang/Format/Format.h has intentional multiline comments
return res;
}
cpp.cxxFlags: base.concat(libclang.llvmToolingCxxFlags)
cpp.includePaths: base.concat(libclang.llvmIncludeDir)
cpp.libraryPaths: base.concat(libclang.llvmLibDir)
cpp.dynamicLibraries: base.concat(libclang.llvmFormattingLibs)
src/shared/clang/clang_installation.pri
+2 -1
View File
@@ -176,7 +176,8 @@ isEmpty(LLVM_VERSION) {
GCC_MAJOR_VERSION = $$section(GCC_VERSION, ., 0, 0)
# GCC8 warns about memset/memcpy for types with copy ctor. Clang has some of these.
greaterThan(GCC_MAJOR_VERSION, 7):QMAKE_CXXFLAGS += -Wno-class-memaccess
QMAKE_CXXFLAGS += -Wno-unused-parameter
# clang/Format/Format.h has intentional multiline comments
QMAKE_CXXFLAGS += -Wno-unused-parameter -Wno-comment
}
LLVM_LIBDIR = $$quote($$system($$llvm_config --libdir, lines))