forked from qt-creator/qt-creator
Merge remote-tracking branch 'origin/4.14'
Change-Id: Iea84f23cf394de13e99a9ed777c8c113e4eff473
This commit is contained in:
@@ -596,6 +596,7 @@ static QStringList languageFeatureMacros()
|
||||
"__cpp_binary_literals",
|
||||
"__cpp_capture_star_this",
|
||||
"__cpp_constexpr",
|
||||
"__cpp_constexpr_in_decltype",
|
||||
"__cpp_decltype",
|
||||
"__cpp_decltype_auto",
|
||||
"__cpp_deduction_guides",
|
||||
|
||||
@@ -100,7 +100,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/10.0.0/tools/clang/tools/extra/docs/clang-tidy/checks/%1.html";
|
||||
= "https://releases.llvm.org/11.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";
|
||||
|
||||
@@ -127,7 +127,7 @@ QString CppToolsJsExtension::includeStatement(
|
||||
{
|
||||
if (fullyQualifiedClassName.isEmpty())
|
||||
return {};
|
||||
const QString className = parts(fullyQualifiedClassName).last();
|
||||
const QString className = parts(fullyQualifiedClassName).constLast();
|
||||
if (className.isEmpty() || specialClasses.contains(className))
|
||||
return {};
|
||||
if (className.startsWith('Q') && className.length() > 2 && className.at(1).isUpper())
|
||||
|
||||
@@ -43,7 +43,6 @@
|
||||
#include <QDebug>
|
||||
#include <QRegularExpression>
|
||||
#include <QSet>
|
||||
#include <QStringRef>
|
||||
#include <QTextCursor>
|
||||
#include <QTextDocument>
|
||||
|
||||
|
||||
@@ -37,7 +37,6 @@
|
||||
QT_BEGIN_NAMESPACE
|
||||
class QChar;
|
||||
class QFileInfo;
|
||||
class QStringRef;
|
||||
class QTextCursor;
|
||||
QT_END_NAMESPACE
|
||||
|
||||
|
||||
@@ -108,7 +108,8 @@ QString StringTablePrivate::insert(const QString &string)
|
||||
|
||||
void StringTable::scheduleGC()
|
||||
{
|
||||
QMetaObject::invokeMethod(&m_instance->m_gcCountDown, "start", Qt::QueuedConnection);
|
||||
QMetaObject::invokeMethod(&m_instance->m_gcCountDown, QOverload<>::of(&QTimer::start),
|
||||
Qt::QueuedConnection);
|
||||
}
|
||||
|
||||
StringTable::StringTable()
|
||||
|
||||
Reference in New Issue
Block a user