From 1b4aa44e89d47222ca686e17fd8892513176ca6f Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 8 May 2023 14:51:42 +0200 Subject: [PATCH] QmlDesignerBase: Remove the dependency on IOptionPage's QObject base The base will be cut soonish, and the only use here was tr() with a (wrong) context. Use StudioSettingsPage for that now. Change-Id: I41e4b737713591e002c126bbf97226de7c3f784f Reviewed-by: Mahmoud Badri --- src/plugins/qmldesignerbase/qmldesignerbaseplugin.cpp | 2 +- src/plugins/qmldesignerbase/qmldesignerbaseplugin.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/plugins/qmldesignerbase/qmldesignerbaseplugin.cpp b/src/plugins/qmldesignerbase/qmldesignerbaseplugin.cpp index 0dc9734e8fb..0a9ef8483a1 100644 --- a/src/plugins/qmldesignerbase/qmldesignerbaseplugin.cpp +++ b/src/plugins/qmldesignerbase/qmldesignerbaseplugin.cpp @@ -264,7 +264,7 @@ void StudioSettingsPage::apply() StudioConfigSettingsPage::StudioConfigSettingsPage() { setId("Z.StudioConfig.Settings"); - setDisplayName(tr("Qt Design Studio Configuration")); + setDisplayName(StudioSettingsPage::tr("Qt Design Studio Configuration")); setCategory(Core::Constants::SETTINGS_CATEGORY_CORE); setWidgetCreator([] { return new StudioSettingsPage; }); } diff --git a/src/plugins/qmldesignerbase/qmldesignerbaseplugin.h b/src/plugins/qmldesignerbase/qmldesignerbaseplugin.h index de9c9cabe37..3676a04e8c1 100644 --- a/src/plugins/qmldesignerbase/qmldesignerbaseplugin.h +++ b/src/plugins/qmldesignerbase/qmldesignerbaseplugin.h @@ -35,8 +35,6 @@ private: class QMLDESIGNERBASE_EXPORT StudioConfigSettingsPage : public Core::IOptionsPage { - Q_OBJECT - public: StudioConfigSettingsPage(); };