diff options
Diffstat (limited to 'src/qml/doc')
| -rw-r--r-- | src/qml/doc/src/qmllanguageref/modules/identifiedmodules.qdoc | 4 | ||||
| -rw-r--r-- | src/qml/doc/src/qmllanguageref/syntax/imports.qdoc | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/doc/src/qmllanguageref/modules/identifiedmodules.qdoc b/src/qml/doc/src/qmllanguageref/modules/identifiedmodules.qdoc index 914a40599c..303ed6b18c 100644 --- a/src/qml/doc/src/qmllanguageref/modules/identifiedmodules.qdoc +++ b/src/qml/doc/src/qmllanguageref/modules/identifiedmodules.qdoc @@ -175,13 +175,13 @@ An identified module has several restrictions upon it: \endlist For example, if an identified module is installed into -\c{$QML2_IMPORT_PATH/ExampleModule}, the module identifier directive must be: +\c{$QML_IMPORT_PATH/ExampleModule}, the module identifier directive must be: \code module ExampleModule \endcode If the strict module is installed into -\c{$QML2_IMPORT_PATH/com/example/CustomUi}, the module identifier directive +\c{$QML_IMPORT_PATH/com/example/CustomUi}, the module identifier directive must be: \code module com.example.CustomUi diff --git a/src/qml/doc/src/qmllanguageref/syntax/imports.qdoc b/src/qml/doc/src/qmllanguageref/syntax/imports.qdoc index 4a350877ca..14a99c44f4 100644 --- a/src/qml/doc/src/qmllanguageref/syntax/imports.qdoc +++ b/src/qml/doc/src/qmllanguageref/syntax/imports.qdoc @@ -290,19 +290,19 @@ default locations to be searched by the engine. By default, this list contains: \list \li The directory of the current file \li The location specified by QLibraryInfo::QmlImportsPath -\li Paths specified by the \c QML2_IMPORT_PATH environment variable +\li Paths specified by the \c QML_IMPORT_PATH environment variable \li The qrc:/qt-project.org/imports path inside the resources. \endlist Additional import paths can be added through QQmlEngine::addImportPath() or the -\c QML2_IMPORT_PATH environment variable. When running the +\c QML_IMPORT_PATH environment variable. When running the \l{Prototyping with qmlscene}{qmlscene} tool, you can also use the \c -I option to add an import path. -You can specify multiple import paths in the \c QML2_IMPORT_PATH environment +You can specify multiple import paths in the \c QML_IMPORT_PATH environment variable by joining them using the path separator. On Windows the path separator is a semicolon (;), on other platforms it is a colon (:). This means that you -cannot specify resource paths or URLs in QML2_IMPORT_PATH, as they contain +cannot specify resource paths or URLs in QML_IMPORT_PATH, as they contain colons themselves. However, you can add resource paths and URLs by calling QQmlEngine::addImportPath() programatically. |