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

Merge remote-tracking branch 'origin/4.13' into master

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
	src/plugins/cmakeprojectmanager/cmakebuildstep.h
	tests/auto/debugger/tst_namedemangler.cpp
	tests/auto/qml/codemodel/check/tst_check.cpp

Change-Id: Iefd5f71c03c0078513b76a92af764a4fb22ee4c2
This commit is contained in:
Eike Ziller
2020-08-10 14:23:50 +02:00
parent 84e4b3af31 acadee710e
commit 3944162039
205 changed files with 6161 additions and 10173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cpptools/cpptoolsconstants.h
View File

@@ -99,7 +99,7 @@ const char SYMBOLS_FIND_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("CppTools", "C
// CLANG_VERSION here because it might denote a version that was not yet
// released (e.g. 6.0.1, but only 6.0.0 was released).
constexpr const char TIDY_DOCUMENTATION_URL_TEMPLATE[]
= "https://releases.llvm.org/8.0.1/tools/clang/tools/extra/docs/clang-tidy/checks/%1.html";
= "https://releases.llvm.org/10.0.0/tools/clang/tools/extra/docs/clang-tidy/checks/%1.html";
constexpr const char CLANG_STATIC_ANALYZER_DOCUMENTATION_URL[]
= "https://clang-analyzer.llvm.org/available_checks.html";

2
src/plugins/cpptools/cpptoolsjsextension.cpp
View File

@@ -121,7 +121,7 @@ QString CppToolsJsExtension::closeNamespaces(const QString &klass) const
QString CppToolsJsExtension::includeStatement(
const QString &fullyQualifiedClassName,
const QString &suffix,
const QString &specialClasses,
const QStringList &specialClasses,
const QString &pathOfIncludingFile
)
{

2
src/plugins/cpptools/cpptoolsjsextension.h
View File

@@ -60,7 +60,7 @@ public:
Q_INVOKABLE QString includeStatement(
const QString &fullyQualifiedClassName,
const QString &suffix,
const QString &specialClasses,
const QStringList &specialClasses,
const QString &pathOfIncludingFile
);
};