diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2021-02-05 18:12:42 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2021-02-09 21:46:43 +0100 |
| commit | b17ccb8af9f9149d100e391af9e1c25e97a962d0 (patch) | |
| tree | 2ed22a5c36b4e938a801500b7bd8e2773b9fe503 /src | |
| parent | dab0d62b655ce9a476993de2558a573a5066288c (diff) | |
Use QLibraryInfo::QmlImportsPath rather than Qml2ImportsPath
The "2" is meaningless and there is a better name available now.
Task-number: QTBUG-85064
Change-Id: I65d26b06712ed7dcf2825f16dffaa6060dd86985
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/qml/doc/src/qmllanguageref/syntax/imports.qdoc | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqmlengine.cpp | 4 | ||||
| -rw-r--r-- | src/qml/qml/qqmlimport.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/qml/doc/src/qmllanguageref/syntax/imports.qdoc b/src/qml/doc/src/qmllanguageref/syntax/imports.qdoc index fdba452271..4a350877ca 100644 --- a/src/qml/doc/src/qmllanguageref/syntax/imports.qdoc +++ b/src/qml/doc/src/qmllanguageref/syntax/imports.qdoc @@ -289,7 +289,7 @@ 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::Qml2ImportsPath +\li The location specified by QLibraryInfo::QmlImportsPath \li Paths specified by the \c QML2_IMPORT_PATH environment variable \li The qrc:/qt-project.org/imports path inside the resources. \endlist diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index 9b410bd1bf..eb0d2f24f3 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -1920,7 +1920,7 @@ void QQmlEngine::addImportPath(const QString& path) By default, the list contains the directory of the application executable, paths specified in the \c QML2_IMPORT_PATH environment variable, - and the builtin \c Qml2ImportsPath from QLibraryInfo. + and the builtin \c QmlImportsPath from QLibraryInfo. \sa addImportPath(), setImportPathList() */ @@ -1936,7 +1936,7 @@ QStringList QQmlEngine::importPathList() const By default, the list contains the directory of the application executable, paths specified in the \c QML2_IMPORT_PATH environment variable, - and the builtin \c Qml2ImportsPath from QLibraryInfo. + and the builtin \c QmlImportsPath from QLibraryInfo. \sa importPathList(), addImportPath() */ diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp index 4e6a4a8928..7fa9277ab3 100644 --- a/src/qml/qml/qqmlimport.cpp +++ b/src/qml/qml/qqmlimport.cpp @@ -1942,9 +1942,9 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e) : engine(e) { filePluginPath << QLatin1String("."); - // Search order is applicationDirPath(), qrc:/qt-project.org/imports, $QML2_IMPORT_PATH, QLibraryInfo::Qml2ImportsPath + // Search order is applicationDirPath(), qrc:/qt-project.org/imports, $QML2_IMPORT_PATH, QLibraryInfo::QmlImportsPath - QString installImportsPath = QLibraryInfo::path(QLibraryInfo::Qml2ImportsPath); + QString installImportsPath = QLibraryInfo::path(QLibraryInfo::QmlImportsPath); addImportPath(installImportsPath); // env import paths |