From 0a4471dbbbf3564a5b3b32a25215a4c11d7e3618 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 20 Feb 2020 16:32:01 +0100 Subject: [PATCH] QmlDesigner: Rename 'Imports' to 'QML Imports' Change-Id: Ice57052273ac2e7eef555c9a26a9032098541d8e Reviewed-by: Leena Miettinen Reviewed-by: Alessandro Portale --- .../src/qtquick/creator-only/qtquick-iso-icon-browser.qdoc | 2 +- .../qtquick/creator-only/qtquick-modules-with-plugins.qdoc | 2 +- doc/qtcreator/src/qtquick/qtquick-components.qdoc | 6 +++--- doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-using.qdoc | 4 ++-- .../components/itemlibrary/itemlibrarywidget.cpp | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-iso-icon-browser.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-iso-icon-browser.qdoc index c84529b2982..0dbfc06b9fb 100644 --- a/doc/qtcreator/src/qtquick/creator-only/qtquick-iso-icon-browser.qdoc +++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-iso-icon-browser.qdoc @@ -48,7 +48,7 @@ \li Open the Qt Quick UI form in the \uicontrol Design mode. - \li In the \uicontrol Library, select \uicontrol Imports > + \li In the \uicontrol Library, select \uicontrol {QML Imports} > \uicontrol {Add Import} > \uicontrol {QtQuick.Extras} to import the \l {Qt Quick Extras} module. diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-modules-with-plugins.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-modules-with-plugins.qdoc index 0354299713a..709cadb3a81 100644 --- a/doc/qtcreator/src/qtquick/creator-only/qtquick-modules-with-plugins.qdoc +++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-modules-with-plugins.qdoc @@ -76,7 +76,7 @@ \endlist - Your module should now appear in the \uicontrol Imports tab in the + Your module should now appear in the \uicontrol {QML Imports} tab in the \uicontrol Library in the Design mode. Your components should appear in the \uicontrol {QML Types} tab if a valid \c .metainfo file is in place. diff --git a/doc/qtcreator/src/qtquick/qtquick-components.qdoc b/doc/qtcreator/src/qtquick/qtquick-components.qdoc index 475a8928b53..fac448c820a 100644 --- a/doc/qtcreator/src/qtquick/qtquick-components.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-components.qdoc @@ -48,7 +48,7 @@ applications. The \uicontrol {Library} pane lists the available QML types, UI - components, assets, and imports. + components, assets, and QML imports. \image qmldesigner-qml-components.png "QML Components" @@ -60,11 +60,11 @@ Quick Controls, Dialogs, and Layouts are available for creating user interfaces using Qt Quick 2. The components and controls are based on standard QML types. To view the components and controls in the - \uicontrol {Library}, import the component sets in \uicontrol Imports. + \uicontrol {Library}, import the component sets in \uicontrol {QML Imports}. The \uicontrol {Qt Quick Application} wizards for a particular platform add the import statements automatically. You can remove import statements in - \uicontrol Imports + \uicontrol {QML Imports} \uicontrol {Assets} displays the images and other files that you copy to the project folder (to the same subfolder as the QML files). diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-using.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-using.qdoc index 2e76d6c59e0..412c20fca2e 100644 --- a/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-using.qdoc +++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-using.qdoc @@ -168,8 +168,8 @@ example, if you drew a rectangle, you can export it as a \l Rectangle component. You can provide the import statement of the module where the QML - type is defined in the \uicontrol Imports field. - \li In the \uicontrol Imports field, enter + type is defined in the \uicontrol {QML Imports} field. + \li In the \uicontrol {QML Imports} field, enter additional import statements to have them added to the generated QML file. For example, to use Qt Quick Controls 2.3, you need the import statement \c {QtQuick.Controls 2.3} and to use Qt Quick diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp index d08618ab8df..69d431582a0 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp @@ -121,7 +121,7 @@ ItemLibraryWidget::ItemLibraryWidget(QWidget *parent) : auto tabBar = new QTabBar(this); tabBar->addTab(tr("QML Types", "Title of library QML types view")); tabBar->addTab(tr("Assets", "Title of library assets view")); - tabBar->addTab(tr("Imports", "Title of library imports view")); + tabBar->addTab(tr("QML Imports", "Title of QML imports view")); tabBar->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); connect(tabBar, &QTabBar::currentChanged, this, &ItemLibraryWidget::setCurrentIndexOfStackedWidget); connect(tabBar, &QTabBar::currentChanged, this, &ItemLibraryWidget::updateSearch);