From 3c99f02bcb33b589523e2f698ee1f618f8fb23f9 Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Tue, 16 Feb 2010 13:53:29 +0100
Subject: [PATCH] Rename QMake to qmake since that's the official spelling.
---
doc/qtcreator.qdoc | 4 ++--
src/plugins/coreplugin/mimedatabase.cpp | 2 +-
src/plugins/qt4projectmanager/projectloadwizard.cpp | 2 +-
src/plugins/qt4projectmanager/qmakestep.cpp | 10 +++++-----
src/plugins/qt4projectmanager/qmakestep.ui | 2 +-
src/plugins/qt4projectmanager/qt-s60/s60devices.cpp | 2 +-
.../qt4projectmanager/qt4buildconfiguration.cpp | 2 +-
src/plugins/qt4projectmanager/qtoptionspage.cpp | 2 +-
src/plugins/qt4projectmanager/qtversionmanager.cpp | 2 +-
src/plugins/qt4projectmanager/qtversionmanager.ui | 6 +++---
10 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index 8a3ebb37f35..5a421d8531d 100644
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
@@ -382,7 +382,7 @@
\i \image qtcreator-qt4-qtversions.png
\i \bold{Linux and Mac OS X}
- On Linux and Mac OS X, set the \gui{path to QMake}
+ On Linux and Mac OS X, set the \gui{path to qmake}
to the \c qmake binary of the Qt installation. If a Qt is
found in the \c PATH environment variable, it shows up
automatically as \gui{Qt in PATH}.
@@ -1966,7 +1966,7 @@
describe the procedure required for each project type.
- \section1 QMake Projects (the default)
+ \section1 qmake Projects (the default)
Open your project file (\c{.pro}) from the \gui{Projects} pane. Then,
follow the guidelines in the
diff --git a/src/plugins/coreplugin/mimedatabase.cpp b/src/plugins/coreplugin/mimedatabase.cpp
index bc1dfcb3479..b39eed15183 100644
--- a/src/plugins/coreplugin/mimedatabase.cpp
+++ b/src/plugins/coreplugin/mimedatabase.cpp
@@ -85,7 +85,7 @@ enum { BinaryMatchPriority = 1, TextMatchPriority = 2};
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
<!-- Mime types must match the desktop file associations -->
<mime-type type="application/vnd.nokia.qt.qmakeprofile">
- <comment xml:lang="en">Qt QMake Profile</comment>
+ <comment xml:lang="en">Qt qmake Profile</comment>
<glob pattern="*.pro"/>
</mime-type>
</mime-info>
diff --git a/src/plugins/qt4projectmanager/projectloadwizard.cpp b/src/plugins/qt4projectmanager/projectloadwizard.cpp
index 267bb31f16c..7195223cddd 100644
--- a/src/plugins/qt4projectmanager/projectloadwizard.cpp
+++ b/src/plugins/qt4projectmanager/projectloadwizard.cpp
@@ -204,7 +204,7 @@ void ProjectLoadWizard::setupImportPage(QtVersion *version, QtVersion::QmakeBuil
importLabel->setText(tr("Qt Creator has found an already existing build in the source directory.<br><br>"
"<b>Qt Version:</b> %1<br>"
"<b>Build configuration:</b> %2<br>"
- "<b>Additional QMake Arguments:</b>%3")
+ "<b>Additional qmake Arguments:</b>%3")
.arg(versionString)
.arg(buildConfigString)
.arg(ProjectExplorer::Environment::joinArgumentList(addtionalArguments)));
diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp
index 60c8ccafd80..a100bbbfc4d 100644
--- a/src/plugins/qt4projectmanager/qmakestep.cpp
+++ b/src/plugins/qt4projectmanager/qmakestep.cpp
@@ -77,7 +77,7 @@ QMakeStep::QMakeStep(Qt4BuildConfiguration *bc, QMakeStep *bs) :
void QMakeStep::ctor()
{
- setDisplayName(tr("QMake", "QMakeStep display name."));
+ setDisplayName(tr("qmake", "QMakeStep display name."));
}
QMakeStep::~QMakeStep()
@@ -187,7 +187,7 @@ void QMakeStep::run(QFutureInterface<bool> &fi)
}
if (!m_needToRunQMake) {
- emit addOutput(tr("<font color=\"#0000ff\">Configuration unchanged, skipping QMake step.</font>"));
+ emit addOutput(tr("<font color=\"#0000ff\">Configuration unchanged, skipping qmake step.</font>"));
fi.reportResult(true);
return;
}
@@ -362,7 +362,7 @@ void QMakeStepConfigWidget::updateSummaryLabel()
Qt4BuildConfiguration *qt4bc = m_step->qt4BuildConfiguration();
const QtVersion *qtVersion = qt4bc->qtVersion();
if (!qtVersion) {
- m_summaryText = tr("<b>QMake:</b> No Qt version set. QMake can not be run.");
+ m_summaryText = tr("<b>qmake:</b> No Qt version set. Can not be run qmake.");
emit updateSummary();
return;
}
@@ -376,7 +376,7 @@ void QMakeStepConfigWidget::updateSummaryLabel()
// And we only use the .pro filename not the full path
QString program = QFileInfo(qtVersion->qmakeCommand()).fileName();
- m_summaryText = tr("<b>QMake:</b> %1 %2").arg(program, args.join(QString(QLatin1Char(' '))));
+ m_summaryText = tr("<b>qmake:</b> %1 %2").arg(program, args.join(QString(QLatin1Char(' '))));
emit updateSummary();
}
@@ -462,6 +462,6 @@ QStringList QMakeStepFactory::availableCreationIds(ProjectExplorer::BuildConfigu
QString QMakeStepFactory::displayNameForId(const QString &id) const
{
if (id == QLatin1String(QMAKE_BS_ID))
- return tr("QMake");
+ return tr("qmake");
return QString();
}
diff --git a/src/plugins/qt4projectmanager/qmakestep.ui b/src/plugins/qt4projectmanager/qmakestep.ui
index f59dedaf526..801f839f010 100644
--- a/src/plugins/qt4projectmanager/qmakestep.ui
+++ b/src/plugins/qt4projectmanager/qmakestep.ui
@@ -17,7 +17,7 @@
<item row="0" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
- <string>QMake Build Configuration:</string>
+ <string>qmake Build Configuration:</string>
</property>
</widget>
</item>
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devices.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devices.cpp
index d675d2778af..3ca9ba56996 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devices.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devices.cpp
@@ -315,7 +315,7 @@ QString S60Devices::cleanedRootPath(const QString &deviceRoot)
QString path = deviceRoot;
#ifdef Q_OS_WIN
// sbsv2 actually recommends having the DK on a separate drive...
- // But QMake breaks when doing that!
+ // But qmake breaks when doing that!
if (path.size() > 1 && path.at(1) == QChar(':'))
path = path.mid(2);
#endif
diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
index e205507d9be..96a0e71e78c 100644
--- a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
@@ -434,7 +434,7 @@ bool Qt4BuildConfiguration::compareToImportFrom(const QString &workingDirectory)
QPair<QtVersion::QmakeBuildConfigs, QStringList> result =
QtVersionManager::scanMakeFile(workingDirectory, version->defaultBuildConfig());
if (qmakeBuildConfiguration() == result.first) {
- // The QMake Build Configuration are the same,
+ // The qmake Build Configuration are the same,
// now compare arguments lists
// we have to compare without the spec/platform cmd argument
// and compare that on its own
diff --git a/src/plugins/qt4projectmanager/qtoptionspage.cpp b/src/plugins/qt4projectmanager/qtoptionspage.cpp
index 0f6e28f87bd..5daa7fe1575 100644
--- a/src/plugins/qt4projectmanager/qtoptionspage.cpp
+++ b/src/plugins/qt4projectmanager/qtoptionspage.cpp
@@ -151,7 +151,7 @@ QtOptionsPageWidget::QtOptionsPageWidget(QWidget *parent, QList<QtVersion *> ver
m_ui->setupUi(this);
m_ui->qmakePath->setExpectedKind(Utils::PathChooser::File);
- m_ui->qmakePath->setPromptDialogTitle(tr("Select QMake Executable"));
+ m_ui->qmakePath->setPromptDialogTitle(tr("Select qmake Executable"));
m_ui->mingwPath->setExpectedKind(Utils::PathChooser::Directory);
m_ui->mingwPath->setPromptDialogTitle(tr("Select the MinGW Directory"));
m_ui->mwcPath->setExpectedKind(Utils::PathChooser::Directory);
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index c0df21c924a..54574d637a4 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -1385,7 +1385,7 @@ QString QtVersion::invalidReason() const
if (isValid())
return QString();
if (qmakeCommand().isEmpty())
- return QApplication::translate("QtVersion", "No QMake path set");
+ return QApplication::translate("QtVersion", "No qmake path set");
if (displayName().isEmpty())
return QApplication::translate("QtVersion", "Qt Version has no name");
if (m_notInstalled)
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.ui b/src/plugins/qt4projectmanager/qtversionmanager.ui
index 4016df15418..7e2a1b9987a 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.ui
+++ b/src/plugins/qt4projectmanager/qtversionmanager.ui
@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>375</width>
+ <width>405</width>
<height>474</height>
</rect>
</property>
@@ -34,7 +34,7 @@
</column>
<column>
<property name="text">
- <string>QMake Location</string>
+ <string>qmake Location</string>
</property>
</column>
<column>
@@ -110,7 +110,7 @@
<item row="1" column="0">
<widget class="QLabel" name="pathLabel">
<property name="text">
- <string>QMake Location:</string>
+ <string>qmake Location:</string>
</property>
</widget>
</item>
--
GitLab