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

Merge remote-tracking branch 'origin/qds-1.59' into 4.13

Browse Source 
Conflicts:
	src/plugins/clangformat/clangformatplugin.cpp
	src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
	src/plugins/qmldesigner/qmldesigner.qbs

Change-Id: Ie4a0beeb9fd32ac9683f4e8769988a9c3f3e369a
This commit is contained in:
Tim Jenssen
2020-06-26 15:13:07 +02:00
parent 97ac63b401 5a06305ffe
commit b8cd87dea0
123 changed files with 7677 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/clangformat/clangformatplugin.cpp
View File

@@ -153,12 +153,15 @@ bool ClangFormatPlugin::initialize(const QStringList &arguments, QString *errorS
}
return true;
#else
#ifndef Q_CC_MSVC
#ifdef _MSC_VER
#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 = QStringLiteral("Disabling ClangFormat plugin as it has not been built against a modified Clang's libFormat."
*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");
"https://code.qt.io/cgit/qt-creator/qt-creator.git/tree/README.md";
return false;
#endif
}