From da4833cd323894033c5acc7ba93d1c7bd4d5dece Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Fri, 8 Jul 2011 14:54:22 +0200
Subject: [PATCH] MeeGo: Use "MeeGo" instead of Maemo as generic term for MADDE
targets.
Change-Id: I81db8aad05e7eacfd5d8b6c3a72bf723ed0f2c7b
Reviewed-on: http://codereview.qt.nokia.com/1376
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
---
src/plugins/remotelinux/maemoqemumanager.cpp | 8 ++++----
src/plugins/remotelinux/maemosettingspages.cpp | 2 +-
src/plugins/remotelinux/qt4maemotarget.cpp | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/plugins/remotelinux/maemoqemumanager.cpp b/src/plugins/remotelinux/maemoqemumanager.cpp
index 862f55a2403..4ec9bce9a4d 100644
--- a/src/plugins/remotelinux/maemoqemumanager.cpp
+++ b/src/plugins/remotelinux/maemoqemumanager.cpp
@@ -87,9 +87,9 @@ MaemoQemuManager::MaemoQemuManager(QObject *parent)
m_qemuStarterIcon.addFile(":/qt-maemo/images/qemu-stop.png", iconSize,
QIcon::Normal, QIcon::On);
- m_qemuAction = new QAction("Maemo Emulator", this);
+ m_qemuAction = new QAction("MeeGo Emulator", this);
m_qemuAction->setIcon(m_qemuStarterIcon.pixmap(iconSize));
- m_qemuAction->setToolTip(tr("Start Maemo Emulator"));
+ m_qemuAction->setToolTip(tr("Start MeeGo Emulator"));
connect(m_qemuAction, SIGNAL(triggered()), this, SLOT(startRuntime()));
Core::ICore *core = Core::ICore::instance();
@@ -512,10 +512,10 @@ void MaemoQemuManager::updateStarterIcon(bool running)
QString toolTip;
if (running) {
state = QIcon::On;
- toolTip = tr("Stop Maemo Emulator");
+ toolTip = tr("Stop MeeGo Emulator");
} else {
state = QIcon::Off;
- toolTip = tr("Start Maemo Emulator");
+ toolTip = tr("Start MeeGo Emulator");
}
m_qemuAction->setToolTip(toolTip);
diff --git a/src/plugins/remotelinux/maemosettingspages.cpp b/src/plugins/remotelinux/maemosettingspages.cpp
index b1380ff8ada..e22c78b2955 100644
--- a/src/plugins/remotelinux/maemosettingspages.cpp
+++ b/src/plugins/remotelinux/maemosettingspages.cpp
@@ -181,7 +181,7 @@ QString MaemoQemuSettingsPage::id() const
QString MaemoQemuSettingsPage::displayName() const
{
- return tr("Maemo Qemu Settings");
+ return tr("MeeGo Qemu Settings");
}
QString MaemoQemuSettingsPage::category() const
diff --git a/src/plugins/remotelinux/qt4maemotarget.cpp b/src/plugins/remotelinux/qt4maemotarget.cpp
index 92a675c7e85..a89a5206dc7 100644
--- a/src/plugins/remotelinux/qt4maemotarget.cpp
+++ b/src/plugins/remotelinux/qt4maemotarget.cpp
@@ -321,7 +321,7 @@ AbstractQt4MaemoTarget::ActionStatus AbstractQt4MaemoTarget::createTemplates()
QDir projectDir(project()->projectDirectory());
if (!projectDir.exists(PackagingDirName)
&& !projectDir.mkdir(PackagingDirName)) {
- raiseError(tr("Error creating Maemo packaging directory '%1'.")
+ raiseError(tr("Error creating packaging directory '%1'.")
.arg(PackagingDirName));
return ActionFailed;
}
@@ -365,7 +365,7 @@ bool AbstractQt4MaemoTarget::initPackagingSettingsFromOtherTarget()
void AbstractQt4MaemoTarget::raiseError(const QString &reason)
{
- QMessageBox::critical(0, tr("Error creating Maemo templates"), reason);
+ QMessageBox::critical(0, tr("Error creating MeeGo templates"), reason);
}
AbstractDebBasedQt4MaemoTarget::AbstractDebBasedQt4MaemoTarget(Qt4Project *parent,
--
GitLab