diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2019-11-01 11:38:27 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2019-11-04 08:45:12 +0000 |
| commit | 40fc771a519b5abfa44a2ec3a7d77f70f765871f (patch) | |
| tree | c0cb314cd27713326b7a2cbd9cce213ef83945bc | |
| parent | 7c61e936ce3bce473f9caed27dae415c79bab27d (diff) | |
| download | qt-creator-40fc771a519b5abfa44a2ec3a7d77f70f765871f.tar.gz | |
clangformat: Fix building with MSVC for unmodified clang
Amends 1ff337089a579cf698df0ddb6bf8a68ea9e5de2d
Change-Id: Ia830f8799f29a1ae87bb3dd77e8ab48278eb9a7e
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
| -rw-r--r-- | src/plugins/clangformat/clangformatplugin.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/clangformat/clangformatplugin.cpp b/src/plugins/clangformat/clangformatplugin.cpp index 1f3ea8d475..d031cf13e9 100644 --- a/src/plugins/clangformat/clangformatplugin.cpp +++ b/src/plugins/clangformat/clangformatplugin.cpp @@ -155,7 +155,11 @@ bool ClangFormatPlugin::initialize(const QStringList &arguments, QString *errorS } return true; #else -#warning ClangFormat: building dummy plugin due to unmodified Clang, see README.md for more info +#ifdef Q_CC_MSVC +# pragma message("ClangFormat: building dummy plugin due to unmodified Clang, see README.md for more info") +#else +# warning ClangFormat: building dummy plugin due to unmodified Clang, see README.md for more info +#endif *errorString = "Disabling ClangFormat plugin as it has not been built against a modified Clang's libFormat." "For more information see the Qt Creator README at " "https://code.qt.io/cgit/qt-creator/qt-creator.git/tree/README.md"; |