diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2021-02-05 18:43:30 +0100 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2021-02-10 09:27:06 +0100 |
commit | 63bfaae1f527a8f6de34e76dfd1282cd7e22d989 (patch) | |
tree | f280c4b17993ffe647ba5cf13c7f8d159acb6277 /src/qml/doc/src/qmllanguageref/syntax | |
parent | 026f8f4df59b641bcafca7bd392f5efefd795898 (diff) |
Support and prefer QML_IMPORT_PATH over QML2_IMPORT_PATH
The 2 is meaningless.
Task-number: QTBUG-85064
Change-Id: I9f140155d274c691b5eab1285d9b7153f9f93a87
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/doc/src/qmllanguageref/syntax')
-rw-r--r-- | src/qml/doc/src/qmllanguageref/syntax/imports.qdoc | 8 |
1 files changed, 4 insertions, 4 deletions
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. |