diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-09-12 09:08:04 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-09-12 09:08:04 +0200 |
| commit | 8df0653bf8cbb7778d5ab3e32890005874a5a92a (patch) | |
| tree | 565663026d037862c755bcf80887138666bca7f2 /src/shared | |
| parent | 3a5ca31a7ebcc43427802d52bc825e4869d8619d (diff) | |
| parent | a21df46481f580d0f74b5f82f3f3ce1df2445129 (diff) | |
| download | qt-creator-8df0653bf8cbb7778d5ab3e32890005874a5a92a.tar.gz | |
Merge remote-tracking branch 'origin/4.10'
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
src/plugins/projectexplorer/gcctoolchain.cpp
src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp
Change-Id: Iffdf48e782a734107ea170ebb3812e997cea0e7b
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/clang/clang_installation.pri | 1 | ||||
| m--------- | src/shared/qbs | 0 |
2 files changed, 1 insertions, 0 deletions
diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri index df3ce19db2..08838838bc 100644 --- a/src/shared/clang/clang_installation.pri +++ b/src/shared/clang/clang_installation.pri @@ -179,6 +179,7 @@ isEmpty(LLVM_VERSION) { # clang/Format/Format.h has intentional multiline comments QMAKE_CXXFLAGS += -Wno-unused-parameter -Wno-comment } + msvc:QMAKE_CXXFLAGS_WARN_ON += -wd4100 -wd4141 -wd4146 -wd4244 -wd4267 -wd4291 LLVM_LIBDIR = $$quote($$system($$llvm_config --libdir, lines)) LLVM_BINDIR = $$quote($$system($$llvm_config --bindir, lines)) diff --git a/src/shared/qbs b/src/shared/qbs -Subproject 5367331250368ada068c02c3027369e1d7a59ee +Subproject 8c290c624d343406442b87121ccb2e4eab0e6e5 |