From 2770f92f53f9486cd35f8c1489006bf920512468 Mon Sep 17 00:00:00 2001 From: Marcus Tillmanns Date: Thu, 4 Aug 2022 11:27:50 +0200 Subject: [PATCH] QDS: Fix unused variable warnings Change-Id: I3ea21d5883cb75dd2507ad3d0aa6b3e24ed8354e Reviewed-by: Samuel Ghinet Reviewed-by: Thomas Hartmann Reviewed-by: --- .../designercore/projectstorage/qmldocumentparser.h | 5 +++-- .../qmldesigner/designercore/projectstorage/qmltypesparser.h | 5 +++-- src/plugins/qmlprojectmanager/qmlproject.cpp | 2 -- tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp | 3 --- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/projectstorage/qmldocumentparser.h b/src/plugins/qmldesigner/designercore/projectstorage/qmldocumentparser.h index edc5709ed8b..785ab669bd4 100644 --- a/src/plugins/qmldesigner/designercore/projectstorage/qmldocumentparser.h +++ b/src/plugins/qmldesigner/designercore/projectstorage/qmldocumentparser.h @@ -57,7 +57,8 @@ public: Utils::SmallStringView directoryPath) override; private: - ProjectStorage &m_storage; - PathCache &m_pathCache; + // m_pathCache and m_storage are only used when compiled for QDS + [[maybe_unused]] ProjectStorage &m_storage; + [[maybe_unused]] PathCache &m_pathCache; }; } // namespace QmlDesigner diff --git a/src/plugins/qmldesigner/designercore/projectstorage/qmltypesparser.h b/src/plugins/qmldesigner/designercore/projectstorage/qmltypesparser.h index f6af83725b0..cbbb9192689 100644 --- a/src/plugins/qmldesigner/designercore/projectstorage/qmltypesparser.h +++ b/src/plugins/qmldesigner/designercore/projectstorage/qmltypesparser.h @@ -57,7 +57,8 @@ public: const Storage::Synchronization::ProjectData &projectData) override; private: - PathCache &m_pathCache; - ProjectStorage &m_storage; + // m_pathCache and m_storage are only used when compiled for QDS + [[maybe_unused]] PathCache &m_pathCache; + [[maybe_unused]] ProjectStorage &m_storage; }; } // namespace QmlDesigner diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp index 3f20a22a6a5..6d3e30f9ec9 100644 --- a/src/plugins/qmlprojectmanager/qmlproject.cpp +++ b/src/plugins/qmlprojectmanager/qmlproject.cpp @@ -88,8 +88,6 @@ static int preferedQtTarget(Target *target) return 5; } -const char openInQDSAppSetting[] = "OpenInQDSApp"; - Utils::FilePaths QmlProject::getUiQmlFilesForFolder(const Utils::FilePath &folder) { const Utils::FilePaths uiFiles = files([&](const ProjectExplorer::Node *node) { diff --git a/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp index 24dd6f1239d..d77232adcad 100644 --- a/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp +++ b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp @@ -9023,9 +9023,6 @@ void tst_TestCore::writeAnnotations() " }\n" "}"); - const QLatin1String metaCode("\n/*##^## Designer {\n D{i:0;x:10}D{i:1;test:true;x:10;test2:\"string\"}" - "D{i:2;test:true;x:10;test2:\"string\"}\n}\n ##^##*/\n"); - QPlainTextEdit textEdit; textEdit.setPlainText(qmlCode); NotIndentingTextEditModifier textModifier(&textEdit);