From 718dd06ed84436bf204f1e66782b75a6b8da28bf Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Thu, 18 Mar 2010 10:50:20 +0100
Subject: [PATCH] Make use of QML, Qml, and Quick consistent
- It's QML, not Qml. But this is only the file format.
- The umbrella term is Quick (or Qt Quick, to be sorted out)
---
doc/qtcreator.qdoc | 6 +++---
src/app/Info.plist | 2 +-
src/plugins/projectexplorer/userfileaccessor.cpp | 2 +-
src/plugins/qmldesigner/QmlDesigner.pluginspec | 4 ++--
.../qmldesigner/core/metainfo/propertymetainfo.cpp | 2 +-
.../qmldesigner/core/metainfo/subcomponentmanager.cpp | 4 ++--
src/plugins/qmldesigner/core/model/model.cpp | 4 ++--
src/plugins/qmldesigner/core/model/modelnode.cpp | 4 ++--
src/plugins/qmldesigner/qmldesignerconstants.h | 2 +-
src/plugins/qmldesigner/settingspage.cpp | 4 ++--
src/plugins/qmlinspector/QmlInspector.pluginspec | 4 ++--
src/plugins/qmljseditor/QmlJSEditor.pluginspec | 2 +-
src/plugins/qmlprojectmanager/QmlProject.mimetypes.xml | 2 +-
.../qmlprojectmanager/QmlProjectManager.pluginspec | 4 ++--
.../qmlprojectmanager/qmlprojectapplicationwizard.cpp | 4 ++--
src/plugins/qmlprojectmanager/qmlprojectconstants.h | 2 +-
src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp | 4 ++--
src/plugins/qmlprojectmanager/qmlprojecttarget.cpp | 8 ++++----
src/plugins/qmlprojectmanager/qmltaskmanager.cpp | 2 +-
19 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index b72a399ea81..6a3f87bb340 100644
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
@@ -1313,7 +1313,7 @@
\list 1
- \o Select \gui{File > New File or Project > QML Project > QML Application > OK}.
+ \o Select \gui{File > New File or Project > Qt Quick Project > QML Application > OK}.
\image qmldesigner-new-project.png "New File or Project dialog"
@@ -3034,7 +3034,7 @@
\section1 Creating QML Projects
- Select \gui {File > New File or Project > QML Project > QML Application}.
+ Select \gui {File > New File or Project > Qt Quick Project > QML Application}.
\QMLD creates the following files:
@@ -3053,7 +3053,7 @@
project folder.
To import a QML project to Qt Creator, select
- \gui {File > New File or Project > QML Project > Import Existing QML Directory}.
+ \gui {File > New File or Project > Qt Quick Project > Import Existing Qt QML Directory}.
\section1 Designing Application UI
diff --git a/src/app/Info.plist b/src/app/Info.plist
index b1d1c6bd1c3..ac5b94dfd3b 100644
--- a/src/app/Info.plist
+++ b/src/app/Info.plist
@@ -56,7 +56,7 @@
<string>qmlproject</string>
</array>
<key>CFBundleTypeName</key>
- <string>QML Project File</string>
+ <string>Quick Project File</string>
<key>LSHandlerRank</key>
<string>Default</string>
</dict>
diff --git a/src/plugins/projectexplorer/userfileaccessor.cpp b/src/plugins/projectexplorer/userfileaccessor.cpp
index 6b03599a484..a885c66b43a 100644
--- a/src/plugins/projectexplorer/userfileaccessor.cpp
+++ b/src/plugins/projectexplorer/userfileaccessor.cpp
@@ -779,7 +779,7 @@ QVariantMap Version1Handler::update(Project *project, const QVariantMap &map)
targets << TargetDescription(QString::fromLatin1("QmlProjectManager.QmlTarget"),
QCoreApplication::translate("QmlProjectManager::QmlTarget",
"QML Runtime",
- "Qml Runtime target display name"));
+ "QML Runtime target display name"));
else
return QVariantMap(); // We do not know how to handle this.
diff --git a/src/plugins/qmldesigner/QmlDesigner.pluginspec b/src/plugins/qmldesigner/QmlDesigner.pluginspec
index 70bab152f88..916d7b8229f 100644
--- a/src/plugins/qmldesigner/QmlDesigner.pluginspec
+++ b/src/plugins/qmldesigner/QmlDesigner.pluginspec
@@ -16,8 +16,8 @@ General Public License version 2.1 as published by the Free Software
Foundation. Please review the following information to
ensure the GNU Lesser General Public License version 2.1 requirements
will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
- <category>QML</category>
- <description>Editor for QML.</description>
+ <category>Qt Quick</category>
+ <description>Visual Designer for QML files.</description>
<url>http://qt.nokia.com</url>
<dependencyList>
<dependency name="Core" version="1.3.82"/>
diff --git a/src/plugins/qmldesigner/core/metainfo/propertymetainfo.cpp b/src/plugins/qmldesigner/core/metainfo/propertymetainfo.cpp
index af4ba9dd55b..9e84ae056cf 100644
--- a/src/plugins/qmldesigner/core/metainfo/propertymetainfo.cpp
+++ b/src/plugins/qmldesigner/core/metainfo/propertymetainfo.cpp
@@ -430,7 +430,7 @@ QVariant PropertyMetaInfo::castedValue(const QVariant &originalVariant) const
} else if (type() == "var" || type() == "variant") {
return variant;
} else if (type() == "alias") {
- // TODO: The Qml compiler resolves the alias type. We probably should do the same.
+ // TODO: The QML compiler resolves the alias type. We probably should do the same.
return variant;
} else if (variant.convert(typeId)) {
return variant;
diff --git a/src/plugins/qmldesigner/core/metainfo/subcomponentmanager.cpp b/src/plugins/qmldesigner/core/metainfo/subcomponentmanager.cpp
index 9d81be719d1..c018d2bbff1 100644
--- a/src/plugins/qmldesigner/core/metainfo/subcomponentmanager.cpp
+++ b/src/plugins/qmldesigner/core/metainfo/subcomponentmanager.cpp
@@ -180,7 +180,7 @@ void SubComponentManagerPrivate::parseDirectory(const QString &dirPath)
continue;
}
if (!qmlFile.fileName().at(0).isUpper()) {
- // Qml sub components must be upper case
+ // QML sub components must be upper case
continue;
}
newList << qmlFile;
@@ -304,7 +304,7 @@ void SubComponentManagerPrivate::registerQmlFile(const QFileInfo &fileInfo, cons
nodeInfo.setQmlFile(fileInfo.filePath());
// Add file components to the library
- nodeInfo.setCategory(tr("Qml Components"));
+ nodeInfo.setCategory(tr("QML Components"));
nodeInfo.setIsVisibleToItemLibrary(true);
m_metaInfo.addItemLibraryInfo(nodeInfo, componentName);
diff --git a/src/plugins/qmldesigner/core/model/model.cpp b/src/plugins/qmldesigner/core/model/model.cpp
index b283a3235bb..d109030d85e 100644
--- a/src/plugins/qmldesigner/core/model/model.cpp
+++ b/src/plugins/qmldesigner/core/model/model.cpp
@@ -1064,7 +1064,7 @@ void Model::setFileUrl(const QUrl &url)
}
/*!
- \brief Returns list of Qml types available within the model.
+ \brief Returns list of QML types available within the model.
*/
const MetaInfo Model::metaInfo() const
{
@@ -1081,7 +1081,7 @@ void Model::setMetaInfo(const MetaInfo &metaInfo)
}
/*!
- \brief Returns list of Qml types available within the model.
+ \brief Returns list of QML types available within the model.
*/
MetaInfo Model::metaInfo()
{
diff --git a/src/plugins/qmldesigner/core/model/modelnode.cpp b/src/plugins/qmldesigner/core/model/modelnode.cpp
index dddf44bbc2c..ad31d0ebbcc 100644
--- a/src/plugins/qmldesigner/core/model/modelnode.cpp
+++ b/src/plugins/qmldesigner/core/model/modelnode.cpp
@@ -203,7 +203,7 @@ QString ModelNode::type() const
return m_internalNode->type();
}
-/*! \brief minor number of the Qml Type
+/*! \brief minor number of the QML type
\return minor number
*/
int ModelNode::minorVersion() const
@@ -215,7 +215,7 @@ int ModelNode::minorVersion() const
return m_internalNode->minorVersion();
}
-/*! \brief major number of the Qml Type
+/*! \brief major number of the QML type
\return major number
*/
int ModelNode::majorVersion() const
diff --git a/src/plugins/qmldesigner/qmldesignerconstants.h b/src/plugins/qmldesigner/qmldesignerconstants.h
index 13ce485e027..2ba99865b11 100644
--- a/src/plugins/qmldesigner/qmldesignerconstants.h
+++ b/src/plugins/qmldesigner/qmldesignerconstants.h
@@ -49,7 +49,7 @@ const char * const DESIGN_MODE_NAME = "Design";
const char * const FORM_MIMETYPE = "application/x-qmldesigner";
// This setting is also accessed by the QMlJsEditor.
-const char * const QML_SETTINGS_GROUP = "Qml";
+const char * const QML_SETTINGS_GROUP = "QML";
const char * const QML_DESIGNER_SETTINGS_GROUP = "Designer";
const char * const QML_OPENDESIGNMODE_SETTINGS_KEY = "OpenDesignMode";
enum { QML_OPENDESIGNMODE_DEFAULT = 1 };
diff --git a/src/plugins/qmldesigner/settingspage.cpp b/src/plugins/qmldesigner/settingspage.cpp
index 778848e3de0..b10dbf88581 100644
--- a/src/plugins/qmldesigner/settingspage.cpp
+++ b/src/plugins/qmldesigner/settingspage.cpp
@@ -94,12 +94,12 @@ QString SettingsPage::displayName() const
QString SettingsPage::category() const
{
- return QLatin1String("Qml");
+ return QLatin1String("QML");
}
QString SettingsPage::displayCategory() const
{
- return QCoreApplication::translate("Qml", "QML");
+ return QCoreApplication::translate("QML", "QML");
}
QWidget *SettingsPage::createPage(QWidget *parent)
diff --git a/src/plugins/qmlinspector/QmlInspector.pluginspec b/src/plugins/qmlinspector/QmlInspector.pluginspec
index f3e9ba590be..dd86ffc1f6c 100644
--- a/src/plugins/qmlinspector/QmlInspector.pluginspec
+++ b/src/plugins/qmlinspector/QmlInspector.pluginspec
@@ -16,8 +16,8 @@ General Public License version 2.1 as published by the Free Software
Foundation. Please review the following information to
ensure the GNU Lesser General Public License version 2.1 requirements
will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</license>
- <category>QML</category>
- <description>Qml support</description>
+ <category>Qt Quick</category>
+ <description>Debugger for QML files</description>
<url>http://qt.nokia.com</url>
<dependencyList>
<dependency name="QmlProjectManager" version="1.3.82"/>
diff --git a/src/plugins/qmljseditor/QmlJSEditor.pluginspec b/src/plugins/qmljseditor/QmlJSEditor.pluginspec
index 2a9f5abee14..559bb0eba91 100644
--- a/src/plugins/qmljseditor/QmlJSEditor.pluginspec
+++ b/src/plugins/qmljseditor/QmlJSEditor.pluginspec
@@ -10,7 +10,7 @@ GNU Lesser General Public License Usage
Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
</license>
- <category>QML</category>
+ <category>Qt Quick</category>
<description>Editor for QML and JavaScript.</description>
<url>http://qt.nokia.com</url>
<dependencyList>
diff --git a/src/plugins/qmlprojectmanager/QmlProject.mimetypes.xml b/src/plugins/qmlprojectmanager/QmlProject.mimetypes.xml
index b1d98ca6314..0149926c129 100644
--- a/src/plugins/qmlprojectmanager/QmlProject.mimetypes.xml
+++ b/src/plugins/qmlprojectmanager/QmlProject.mimetypes.xml
@@ -3,7 +3,7 @@
<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
<mime-type type="application/x-qmlproject">
<sub-class-of type="application/x-qml"/>
- <comment>Qml Project file</comment>
+ <comment>QML Project file</comment>
<glob pattern="*.qmlproject"/>
</mime-type>
</mime-info>
diff --git a/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec b/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
index ed511bd1b05..ac1a03c772b 100644
--- a/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
+++ b/src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
@@ -10,8 +10,8 @@ GNU Lesser General Public License Usage
Alternatively, this plugin may be used under the terms of the GNU Lesser General Public License version 2.1 as published by the Free Software Foundation. Please review the following information to ensure the GNU Lesser General Public License version 2.1 requirements will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
</license>
- <category>QML</category>
- <description>Qml support</description>
+ <category>Qt Quick</category>
+ <description>Qt Quick support</description>
<url>http://qt.nokia.com</url>
<dependencyList>
<dependency name="ProjectExplorer" version="1.3.82"/>
diff --git a/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp b/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
index 87a0daba019..23a32c1f072 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
@@ -58,9 +58,9 @@ Core::BaseFileWizardParameters QmlProjectApplicationWizard::parameters()
{
Core::BaseFileWizardParameters parameters(ProjectWizard);
parameters.setIcon(QIcon(QLatin1String(":/wizards/images/console.png")));
- parameters.setDisplayName(tr("QML Application"));
+ parameters.setDisplayName(tr("Qt QML Application"));
parameters.setId(QLatin1String("QA.QML Application"));
- parameters.setDescription(tr("Creates a QML application."));
+ parameters.setDescription(tr("Creates a Qt QML application."));
parameters.setCategory(QLatin1String(Constants::QML_WIZARD_CATEGORY));
parameters.setDisplayCategory(QCoreApplication::translate(Constants::QML_WIZARD_TR_SCOPE,
Constants::QML_WIZARD_TR_CATEGORY));
diff --git a/src/plugins/qmlprojectmanager/qmlprojectconstants.h b/src/plugins/qmlprojectmanager/qmlprojectconstants.h
index 9b431af6313..ebf39208b02 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectconstants.h
+++ b/src/plugins/qmlprojectmanager/qmlprojectconstants.h
@@ -54,7 +54,7 @@ const char *const TASK_CATEGORY_QML = "Task.Category.Qml";
// Wizard category
const char * const QML_WIZARD_CATEGORY = "F.Projects"; // (after Qt)
const char * const QML_WIZARD_TR_SCOPE = "QmlProjectManager";
-const char * const QML_WIZARD_TR_CATEGORY = QT_TRANSLATE_NOOP("QmlProjectManager", "QML Project");
+const char * const QML_WIZARD_TR_CATEGORY = QT_TRANSLATE_NOOP("QmlProjectManager", "Qt Quick Project");
} // namespace Constants
} // namespace QmlProjectManager
diff --git a/src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp b/src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp
index 624077e6523..a243d74d2ae 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp
@@ -56,7 +56,7 @@ namespace Internal {
QmlProjectImportWizardDialog::QmlProjectImportWizardDialog(QWidget *parent)
: QWizard(parent)
{
- setWindowTitle(tr("Import Existing QML Directory"));
+ setWindowTitle(tr("Import Existing Qt QML Directory"));
// first page
m_firstPage = new FileWizardPage;
@@ -100,7 +100,7 @@ Core::BaseFileWizardParameters QmlProjectImportWizard::parameters()
{
Core::BaseFileWizardParameters parameters(ProjectWizard);
parameters.setIcon(QIcon(QLatin1String(":/wizards/images/console.png")));
- parameters.setDisplayName(tr("Import Existing QML Directory"));
+ parameters.setDisplayName(tr("Import Existing Qt QML Directory"));
parameters.setId(QLatin1String("QI.QML Import"));
parameters.setDescription(tr("Creates a QML project from an existing directory of QML files."));
parameters.setCategory(QLatin1String(Constants::QML_WIZARD_CATEGORY));
diff --git a/src/plugins/qmlprojectmanager/qmlprojecttarget.cpp b/src/plugins/qmlprojectmanager/qmlprojecttarget.cpp
index c109fab6012..fcff2b9aca3 100644
--- a/src/plugins/qmlprojectmanager/qmlprojecttarget.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojecttarget.cpp
@@ -44,7 +44,7 @@ QmlProjectTarget::QmlProjectTarget(QmlProject *parent) :
{
setDisplayName(QApplication::translate("QmlProjectManager::QmlTarget",
Constants::QML_VIEWER_TARGET_DISPLAY_NAME,
- "Qml Runtime target display name"));
+ "QML Runtime target display name"));
setIcon(qApp->style()->standardIcon(QStyle::SP_ComputerIcon));
}
@@ -69,7 +69,7 @@ bool QmlProjectTarget::fromMap(const QVariantMap &map)
setDisplayName(QApplication::translate("QmlProjectManager::QmlTarget",
Constants::QML_VIEWER_TARGET_DISPLAY_NAME,
- "Qml Runtime target display name"));
+ "QML Runtime target display name"));
return true;
}
@@ -95,7 +95,7 @@ QString QmlProjectTargetFactory::displayNameForId(const QString &id) const
if (id == QLatin1String(Constants::QML_VIEWER_TARGET_ID))
return QCoreApplication::translate("QmlProjectManager::QmlTarget",
Constants::QML_VIEWER_TARGET_DISPLAY_NAME,
- "Qml Runtime target display name");
+ "QML Runtime target display name");
return QString();
}
@@ -113,7 +113,7 @@ QmlProjectTarget *QmlProjectTargetFactory::create(ProjectExplorer::Project *pare
QmlProject *qmlproject(static_cast<QmlProject *>(parent));
QmlProjectTarget *t(new QmlProjectTarget(qmlproject));
- // Add RunConfiguration (Qml does not have BuildConfigurations)
+ // Add RunConfiguration (QML does not have BuildConfigurations)
QmlProjectRunConfiguration *runConf(new QmlProjectRunConfiguration(t));
t->addRunConfiguration(runConf);
diff --git a/src/plugins/qmlprojectmanager/qmltaskmanager.cpp b/src/plugins/qmlprojectmanager/qmltaskmanager.cpp
index 72455057b54..cf5d8af2dcc 100644
--- a/src/plugins/qmlprojectmanager/qmltaskmanager.cpp
+++ b/src/plugins/qmlprojectmanager/qmltaskmanager.cpp
@@ -45,7 +45,7 @@ void QmlTaskManager::setTaskWindow(ProjectExplorer::TaskWindow *taskWindow)
Q_ASSERT(taskWindow);
m_taskWindow = taskWindow;
- m_taskWindow->addCategory(Constants::TASK_CATEGORY_QML, "Qml");
+ m_taskWindow->addCategory(Constants::TASK_CATEGORY_QML, "QML");
}
void QmlTaskManager::documentUpdated(QmlJS::Document::Ptr /*doc*/)
--
GitLab