Merge remote-tracking branch 'origin/4.10'

Change-Id: I887fbf79ebfdf2af2719cb0d8aa56ab3dcb08fab
This commit is contained in:
Eike Ziller
2019-09-17 16:20:52 +02:00
4 changed files with 11 additions and 9 deletions

View File

@@ -155,8 +155,9 @@ bool ClangFormatPlugin::initialize(const QStringList &arguments, QString *errorS
}
return true;
#else
*errorString = "Disabling ClangFormat plugin as it is not built against a suitable version of "
"Clang's libFormat. For more information, see the Qt Creator README at "
#warning ClangFormat: building dummy plugin due to unmodified Clang, see README.md for more info
*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";
return false;
#endif