From 28820807a1d67a916747c44194c7ebeee38fbe24 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Thu, 25 Feb 2010 10:34:25 +0100
Subject: [PATCH] Tr()-Fixes
---
.../projectexplorer/runsettingspropertiespage.cpp | 2 +-
src/plugins/projectexplorer/targetsettingspanel.cpp | 4 ++--
.../components/pluginmanager/pluginmanager.cpp | 2 +-
src/plugins/qt4projectmanager/qtversionmanager.cpp | 10 +++++-----
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.cpp b/src/plugins/projectexplorer/runsettingspropertiespage.cpp
index f98a69b1113..3a4301f7091 100644
--- a/src/plugins/projectexplorer/runsettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/runsettingspropertiespage.cpp
@@ -100,7 +100,7 @@ QString RunSettingsPanelFactory::id() const
QString RunSettingsPanelFactory::displayName() const
{
- return QCoreApplication::tr("RunSettingsPanelFactory", "Run Settings");
+ return QCoreApplication::translate("RunSettingsPanelFactory", "Run Settings");
}
bool RunSettingsPanelFactory::supports(Project *project)
diff --git a/src/plugins/projectexplorer/targetsettingspanel.cpp b/src/plugins/projectexplorer/targetsettingspanel.cpp
index 55d12c58692..d9e61a8dce3 100644
--- a/src/plugins/projectexplorer/targetsettingspanel.cpp
+++ b/src/plugins/projectexplorer/targetsettingspanel.cpp
@@ -57,7 +57,7 @@ QString TargetSettingsPanelFactory::id() const
QString TargetSettingsPanelFactory::displayName() const
{
- return QCoreApplication::tr("Targets");
+ return QCoreApplication::translate("TargetSettingsPanelFactory", "Targets");
}
bool TargetSettingsPanelFactory::supports(Project *project)
@@ -99,7 +99,7 @@ TargetSettingsPanel::~TargetSettingsPanel()
QString TargetSettingsPanel::displayName() const
{
- return QCoreApplication::tr("Targets");
+ return QCoreApplication::translate("TargetSettingsPanel", "Targets");
}
QWidget *TargetSettingsPanel::widget() const
diff --git a/src/plugins/qmldesigner/components/pluginmanager/pluginmanager.cpp b/src/plugins/qmldesigner/components/pluginmanager/pluginmanager.cpp
index 1bff0ac3de0..4343cc144fb 100644
--- a/src/plugins/qmldesigner/components/pluginmanager/pluginmanager.cpp
+++ b/src/plugins/qmldesigner/components/pluginmanager/pluginmanager.cpp
@@ -158,7 +158,7 @@ QDialog *PluginManager::createAboutPluginDialog(QWidget *parent)
{
QDialog *rc = new QDialog(parent);
rc->setWindowFlags(rc->windowFlags() & ~Qt::WindowContextHelpButtonHint & Qt::Sheet);
- rc->setWindowTitle(QCoreApplication::tr("About plugins"));
+ rc->setWindowTitle(QCoreApplication::translate("QmlDesigner::PluginManager", "About plugins"));
QTreeView *treeView = new QTreeView;
treeView->setModel(createModel(treeView));
treeView->expandAll();
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index db9b7d5e842..eb68a3b76d4 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -1391,13 +1391,13 @@ QString QtVersion::invalidReason() const
if (isValid())
return QString();
if (qmakeCommand().isEmpty())
- return QApplication::translate("QtVersion", "No qmake path set");
+ return QCoreApplication::translate("QtVersion", "No qmake path set");
if (displayName().isEmpty())
- return QApplication::translate("QtVersion", "Qt Version has no name");
+ return QCoreApplication::translate("QtVersion", "Qt Version has no name");
if (m_notInstalled)
- return QApplication::translate("QtVersion", "Qt Version is not installed, please run make install");
+ return QCoreApplication::translate("QtVersion", "Qt Version is not installed, please run make install");
if (!m_versionInfo.contains("QT_INSTALL_BINS"))
- return QApplication::translate("QtVersion", "Could not determine qt install binary, maybe the qmake path is wrong?");
+ return QCoreApplication::translate("QtVersion", "Could not determine qt install binary, maybe the qmake path is wrong?");
return QString();
}
@@ -1503,7 +1503,7 @@ QString QtVersion::buildDebuggingHelperLibrary()
QList<QSharedPointer<ProjectExplorer::ToolChain> > alltc = toolChains();
ProjectExplorer::ToolChain *tc = alltc.isEmpty() ? 0 : alltc.first().data();
if (!tc)
- return QApplication::tr("The Qt Version has no toolchain.");
+ return QCoreApplication::translate("QtVersion", "The Qt Version has no toolchain.");
tc->addToEnvironment(env);
QString output;
QString directory = DebuggingHelperLibrary::copyDebuggingHelperLibrary(qtInstallData, &output);
--
GitLab