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

Compile fixes with Qt 6

Browse Source 
Change-Id: Ia5335bef6aeaff3ce12339db52d96793ff588824
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Jarek Kobus
2020-11-03 17:59:19 +01:00
parent eeb9856064
commit c0408ed52e
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.cpp
View File

@@ -89,7 +89,7 @@ void NodeInstanceSignalSpy::registerChildObject(const QMetaProperty &metaPropert
if (metaProperty.isReadable() if (metaProperty.isReadable()
&& !metaProperty.isWritable() && !metaProperty.isWritable()
&& QmlPrivateGate::isPropertyQObject(metaProperty) && QmlPrivateGate::isPropertyQObject(metaProperty)
&& QLatin1String(metaProperty.name()) != "parent") { && QLatin1String(metaProperty.name()) != QLatin1String("parent")) {
QObject *childObject = QmlPrivateGate::readQObjectProperty(metaProperty, spiedObject); QObject *childObject = QmlPrivateGate::readQObjectProperty(metaProperty, spiedObject);
if (childObject) { if (childObject) {

4
src/plugins/clangcodemodel/clangfollowsymbol.cpp
View File

@@ -75,8 +75,8 @@ static bool isValidIncludePathToken(const ClangBackEnd::TokenInfoContainer &toke
if (!token.extraInfo.includeDirectivePath) if (!token.extraInfo.includeDirectivePath)
return false; return false;
const Utf8String &tokenName = token.extraInfo.token; const Utf8String &tokenName = token.extraInfo.token;
return !tokenName.startsWith("include") && tokenName != "<" && tokenName != ">" return !tokenName.startsWith("include") && tokenName != Utf8String("<")
&& tokenName != "#"; && tokenName != Utf8String(">") && tokenName != Utf8String("#");
} }
static int includePathStartIndex(const QVector<ClangBackEnd::TokenInfoContainer> &marks, static int includePathStartIndex(const QVector<ClangBackEnd::TokenInfoContainer> &marks,

2
src/plugins/texteditor/codeassist/keywordscompletionassist.cpp
View File

@@ -303,7 +303,7 @@ void pathComplete(const AssistInterface *interface, QList<AssistProposalItemInte
// For pragmatic reasons, we don't support spaces in file names here. // For pragmatic reasons, we don't support spaces in file names here.
static const auto canOccurInFilePath = [](const QChar &c) { static const auto canOccurInFilePath = [](const QChar &c) {
return c.isLetterOrNumber() || c == '.' || c == '/' || c == "_" || c == '-'; return c.isLetterOrNumber() || c == '.' || c == '/' || c == '_' || c == '-';
}; };
int pos = interface->position(); int pos = interface->position();