From b1da772f23071569838459fb89fe85115fbaee6d Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 15 Feb 2019 12:31:23 +0100 Subject: [PATCH] QtSupport: Move option page display name to .cpp This makes the string appear in one .o and one .so instead of 39 .o and 14 .o. Change-Id: Ia38ca9a24aa22990be57c36a5eccf8e41dbc6a4c Reviewed-by: Christian Kandeler --- src/plugins/qtsupport/codegensettingspage.cpp | 2 +- src/plugins/qtsupport/qtoptionspage.cpp | 2 +- src/plugins/qtsupport/qtsupportconstants.h | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/plugins/qtsupport/codegensettingspage.cpp b/src/plugins/qtsupport/codegensettingspage.cpp index 39e64db8a27..8f45c02a14d 100644 --- a/src/plugins/qtsupport/codegensettingspage.cpp +++ b/src/plugins/qtsupport/codegensettingspage.cpp @@ -94,7 +94,7 @@ CodeGenSettingsPage::CodeGenSettingsPage(QObject *parent) : { m_parameters.fromSettings(Core::ICore::settings()); setId(Constants::CODEGEN_SETTINGS_PAGE_ID); - setDisplayName(QCoreApplication::translate("QtSupport", Constants::CODEGEN_SETTINGS_PAGE_NAME)); + setDisplayName(QCoreApplication::translate("QtSupport", "Qt Class Generation")); setCategory(CppTools::Constants::CPP_SETTINGS_CATEGORY); } diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp index da156c95261..e10b963b335 100644 --- a/src/plugins/qtsupport/qtoptionspage.cpp +++ b/src/plugins/qtsupport/qtoptionspage.cpp @@ -156,7 +156,7 @@ QtOptionsPage::QtOptionsPage() : m_widget(0) { setId(Constants::QTVERSION_SETTINGS_PAGE_ID); - setDisplayName(QCoreApplication::translate("QtSupport", Constants::QTVERSION_SETTINGS_PAGE_NAME)); + setDisplayName(QCoreApplication::translate("QtSupport", "Qt Versions")); setCategory(ProjectExplorer::Constants::KITS_SETTINGS_CATEGORY); } diff --git a/src/plugins/qtsupport/qtsupportconstants.h b/src/plugins/qtsupport/qtsupportconstants.h index a674dea1a75..f8a453d13db 100644 --- a/src/plugins/qtsupport/qtsupportconstants.h +++ b/src/plugins/qtsupport/qtsupportconstants.h @@ -25,17 +25,12 @@ #pragma once -#include - namespace QtSupport { namespace Constants { // Qt settings pages const char QTVERSION_SETTINGS_PAGE_ID[] = "H.Qt Versions"; -const char QTVERSION_SETTINGS_PAGE_NAME[] = QT_TRANSLATE_NOOP("QtSupport", "Qt Versions"); - const char CODEGEN_SETTINGS_PAGE_ID[] = "Class Generation"; -const char CODEGEN_SETTINGS_PAGE_NAME[] = QT_TRANSLATE_NOOP("QtSupport", "Qt Class Generation"); // QtVersions const char DESKTOPQT[] = "Qt4ProjectManager.QtVersion.Desktop";