Skip to content
GitLab
Commit 718dd06e authored by Kai Koehne's avatar Kai Koehne
Browse files

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)
parent 4ca5e42f
Hide whitespace changes
Inline Side-by-side
doc/qtcreator.qdoc
View file @ 718dd06e
......@@ -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
......
src/app/Info.plist
View file @ 718dd06e
......@@ -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>
......
src/plugins/projectexplorer/userfileaccessor.cpp
View file @ 718dd06e
......@@ -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.
......
src/plugins/qmldesigner/QmlDesigner.pluginspec
View file @ 718dd06e
......@@ -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"/>
......
src/plugins/qmldesigner/core/metainfo/propertymetainfo.cpp
View file @ 718dd06e
......@@ -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;
......
src/plugins/qmldesigner/core/metainfo/subcomponentmanager.cpp
View file @ 718dd06e
......@@ -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);
......
src/plugins/qmldesigner/core/model/model.cpp
View file @ 718dd06e
......@@ -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()
{
......
src/plugins/qmldesigner/core/model/modelnode.cpp
View file @ 718dd06e
......@@ -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
......
src/plugins/qmldesigner/qmldesignerconstants.h
View file @ 718dd06e
......@@ -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 };
......
src/plugins/qmldesigner/settingspage.cpp
View file @ 718dd06e
......@@ -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)
......
src/plugins/qmlinspector/QmlInspector.pluginspec
View file @ 718dd06e
......@@ -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"/>
......
src/plugins/qmljseditor/QmlJSEditor.pluginspec
View file @ 718dd06e
......@@ -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>
......
src/plugins/qmlprojectmanager/QmlProject.mimetypes.xml
View file @ 718dd06e
......@@ -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>
src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
View file @ 718dd06e
......@@ -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"/>
......
src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
View file @ 718dd06e
......@@ -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));
......
src/plugins/qmlprojectmanager/qmlprojectconstants.h
View file @ 718dd06e
......@@ -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
......
src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp
View file @ 718dd06e
......@@ -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));
......
src/plugins/qmlprojectmanager/qmlprojecttarget.cpp
View file @ 718dd06e
......@@ -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);
......
src/plugins/qmlprojectmanager/qmltaskmanager.cpp
View file @ 718dd06e
......@@ -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*/)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment