diff --git a/src/libs/advanceddockingsystem/dockfocuscontroller.cpp b/src/libs/advanceddockingsystem/dockfocuscontroller.cpp index 16450c778ce..4a8038f6eb6 100644 --- a/src/libs/advanceddockingsystem/dockfocuscontroller.cpp +++ b/src/libs/advanceddockingsystem/dockfocuscontroller.cpp @@ -178,6 +178,8 @@ namespace ADS void DockFocusController::onApplicationFocusChanged(QWidget *focusedOld, QWidget *focusedNow) { + Q_UNUSED(focusedOld); + if (d->m_dockManager->isRestoringState()) return; diff --git a/src/plugins/qmldesigner/assetexporterplugin/assetexporterview.cpp b/src/plugins/qmldesigner/assetexporterplugin/assetexporterview.cpp index fbb4173249f..0b0cf575a14 100644 --- a/src/plugins/qmldesigner/assetexporterplugin/assetexporterview.cpp +++ b/src/plugins/qmldesigner/assetexporterplugin/assetexporterview.cpp @@ -37,7 +37,7 @@ namespace { Q_LOGGING_CATEGORY(loggerInfo, "qtc.designer.assetExportPlugin.view", QtInfoMsg) Q_LOGGING_CATEGORY(loggerWarn, "qtc.designer.assetExportPlugin.view", QtWarningMsg) -Q_LOGGING_CATEGORY(loggerError, "qtc.designer.assetExportPlugin.view", QtCriticalMsg) +//Q_LOGGING_CATEGORY(loggerError, "qtc.designer.assetExportPlugin.view", QtCriticalMsg) static const int RetryIntervalMs = 500; static const int MinRetry = 2; diff --git a/src/plugins/qmldesigner/components/componentcore/changestyleaction.cpp b/src/plugins/qmldesigner/components/componentcore/changestyleaction.cpp index b7e10a6da70..1c1eba4944e 100644 --- a/src/plugins/qmldesigner/components/componentcore/changestyleaction.cpp +++ b/src/plugins/qmldesigner/components/componentcore/changestyleaction.cpp @@ -37,10 +37,11 @@ static QString styleConfigFileName(const QString &qmlFileName) { ProjectExplorer::Project *currentProject = ProjectExplorer::SessionManager::projectForFile(Utils::FilePath::fromString(qmlFileName)); - if (currentProject) + if (currentProject) { foreach (const Utils::FilePath &fileName, currentProject->files(ProjectExplorer::Project::SourceFiles)) if (fileName.endsWith("qtquickcontrols2.conf")) return fileName.toString(); + } return QString(); } diff --git a/src/plugins/qmldesigner/components/connectioneditor/backendmodel.cpp b/src/plugins/qmldesigner/components/connectioneditor/backendmodel.cpp index d64a9898a82..36d30713032 100644 --- a/src/plugins/qmldesigner/components/connectioneditor/backendmodel.cpp +++ b/src/plugins/qmldesigner/components/connectioneditor/backendmodel.cpp @@ -104,7 +104,7 @@ void BackendModel::resetModel() } } - if (rootNode.isValid()) + if (rootNode.isValid()) { foreach (const AbstractProperty &property ,rootNode.properties()) if (property.isDynamic() && !simpleTypes.contains(property.dynamicTypeName())) { @@ -133,6 +133,7 @@ void BackendModel::resetModel() appendRow({ type, name, singletonItem, inlineItem }); } } + } m_lock = false; @@ -145,9 +146,10 @@ QStringList BackendModel::possibleCppTypes() const QStringList list; - if (rewriterView) + if (rewriterView) { foreach (const QmlTypeData &cppTypeData, rewriterView->getQMLTypes()) list.append(cppTypeData.typeName); + } return list; } diff --git a/src/plugins/qmldesigner/components/listmodeleditor/listmodeleditormodel.cpp b/src/plugins/qmldesigner/components/listmodeleditor/listmodeleditormodel.cpp index 98722c3e8fb..72ffa6109c4 100644 --- a/src/plugins/qmldesigner/components/listmodeleditor/listmodeleditormodel.cpp +++ b/src/plugins/qmldesigner/components/listmodeleditor/listmodeleditormodel.cpp @@ -60,7 +60,7 @@ public: QVariant data(int role) const override { - if (role == Qt::BackgroundColorRole && hasInvalidValue) + if (role == Qt::BackgroundRole && hasInvalidValue) return QColor{Qt::darkYellow}; return QStandardItem::data(role); diff --git a/src/plugins/qmldesigner/designercore/model/annotation.cpp b/src/plugins/qmldesigner/designercore/model/annotation.cpp index 11a32aae8f6..e27cac283c2 100644 --- a/src/plugins/qmldesigner/designercore/model/annotation.cpp +++ b/src/plugins/qmldesigner/designercore/model/annotation.cpp @@ -267,7 +267,7 @@ QString Annotation::toQString() const void Annotation::fromQString(const QString &str) { - QStringList strl (str.split(s_sep, QString::SplitBehavior::KeepEmptyParts)); + QStringList strl (str.split(s_sep, Qt::KeepEmptyParts)); removeComments(); const int intro = 1; diff --git a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp index a036813cbdf..6a4604df907 100644 --- a/src/plugins/qmldesigner/designercore/model/rewriterview.cpp +++ b/src/plugins/qmldesigner/designercore/model/rewriterview.cpp @@ -256,11 +256,12 @@ void RewriterView::importAdded(const Import &import) if (textToModelMerger()->isActive()) return; - if (import.url() == QLatin1String("Qt")) + if (import.url() == QLatin1String("Qt")) { foreach (const Import &import, model()->imports()) { if (import.url() == QLatin1String("QtQuick")) return; //QtQuick magic we do not have to add an import for Qt } + } modelToTextMerger()->addImport(import);