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

Fix some compiler warnings

Browse Source 
Change-Id: I4eaf47bda086b83618f461ab19d1715c67e27ae1
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2021-08-06 17:23:33 +02:00
parent f719ae57ee
commit 6530a4fdc7
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
View File

@@ -727,7 +727,7 @@ static bool isTypeAvailable(const MockupTypeContainer &mockupType, QQmlEngine *e
void NodeInstanceServer::setupMockupTypes(const QVector<MockupTypeContainer> &container) void NodeInstanceServer::setupMockupTypes(const QVector<MockupTypeContainer> &container)
{ {
for (const MockupTypeContainer &mockupType : container) { for (const MockupTypeContainer &mockupType : container) {
if (!isTypeAvailable(mockupType, engine())) if (!isTypeAvailable(mockupType, engine())) {
#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)) #if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
if (mockupType.majorVersion() == -1 && mockupType.minorVersion() == -1) { if (mockupType.majorVersion() == -1 && mockupType.minorVersion() == -1) {
QQuickDesignerSupportMetaInfo::registerMockupObject(mockupType.importUri().toUtf8(), QQuickDesignerSupportMetaInfo::registerMockupObject(mockupType.importUri().toUtf8(),
@@ -748,7 +748,7 @@ void NodeInstanceServer::setupMockupTypes(const QVector<MockupTypeContainer> &co
mockupType.minorVersion(), mockupType.minorVersion(),
mockupType.typeName()); mockupType.typeName());
#endif #endif
}
} }
} }

4
src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
View File

@@ -668,7 +668,7 @@ bool QmlFlowItemNode::isValidQmlFlowItemNode(const ModelNode &modelNode)
QList<QmlFlowActionAreaNode> QmlFlowItemNode::flowActionAreas() const QList<QmlFlowActionAreaNode> QmlFlowItemNode::flowActionAreas() const
{ {
QList<QmlFlowActionAreaNode> list; QList<QmlFlowActionAreaNode> list;
for (const ModelNode &node : allDirectSubModelNodes()) for (const ModelNode node : allDirectSubModelNodes())
if (QmlFlowActionAreaNode::isValidQmlFlowActionAreaNode(node)) if (QmlFlowActionAreaNode::isValidQmlFlowActionAreaNode(node))
list.append(node); list.append(node);
return list; return list;
@@ -751,7 +751,7 @@ bool QmlFlowViewNode::isValidQmlFlowViewNode(const ModelNode &modelNode)
QList<QmlFlowItemNode> QmlFlowViewNode::flowItems() const QList<QmlFlowItemNode> QmlFlowViewNode::flowItems() const
{ {
QList<QmlFlowItemNode> list; QList<QmlFlowItemNode> list;
for (const ModelNode &node : allDirectSubModelNodes()) for (const ModelNode node : allDirectSubModelNodes())
if (QmlFlowItemNode::isValidQmlFlowItemNode(node) if (QmlFlowItemNode::isValidQmlFlowItemNode(node)
|| QmlVisualNode::isFlowDecision(node) || QmlVisualNode::isFlowDecision(node)
|| QmlVisualNode::isFlowWildcard(node)) || QmlVisualNode::isFlowWildcard(node))

2
src/plugins/qmljseditor/qmljscomponentnamedialog.cpp
View File

@@ -168,7 +168,7 @@ QString ComponentNameDialog::isValid() const
if (!ui->pathEdit->isValid()) if (!ui->pathEdit->isValid())
return tr("Invalid path."); return tr("Invalid path.");
if (QDir(ui->pathEdit->path()).exists(compName + u".qml")) if (QDir(ui->pathEdit->path()).exists(compName + ".qml"))
return tr("Component already exists."); return tr("Component already exists.");
return QString(); return QString();