From 4e5d0cf5e51bede27016ae52fee9199547d0c658 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Fri, 5 Feb 2021 18:08:46 +0100 Subject: [PATCH] QLibraryInfo: Rename Qml2ImportsPath to QmlImportsPath The "2" is meaningless. We retain the old name as alias for source compatibility, but we don't document it anymore. Task-number: QTBUG-85064 Change-Id: Id10d58f6d39a0faaec042304b374ae6b23469362 Reviewed-by: Joerg Bornemann Reviewed-by: Mitch Curtis --- qmake/property.cpp | 2 +- src/corelib/global/qlibraryinfo.cpp | 2 +- src/corelib/global/qlibraryinfo.h | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/qmake/property.cpp b/qmake/property.cpp index 2dc41ece0ea..eb5e582da5b 100644 --- a/qmake/property.cpp +++ b/qmake/property.cpp @@ -54,7 +54,7 @@ static const struct { { "QT_INSTALL_BINS", QLibraryInfo::BinariesPath, false, false }, { "QT_INSTALL_TESTS", QLibraryInfo::TestsPath, false, false }, { "QT_INSTALL_PLUGINS", QLibraryInfo::PluginsPath, false, false }, - { "QT_INSTALL_QML", QLibraryInfo::Qml2ImportsPath, false, false }, + { "QT_INSTALL_QML", QLibraryInfo::QmlImportsPath, false, false }, { "QT_INSTALL_TRANSLATIONS", QLibraryInfo::TranslationsPath, false, false }, { "QT_INSTALL_CONFIGURATION", QLibraryInfo::SettingsPath, false, false }, { "QT_INSTALL_EXAMPLES", QLibraryInfo::ExamplesPath, false, false }, diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index a86436f4c8a..7379975828d 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -860,7 +860,7 @@ QStringList QLibraryInfo::platformPluginArguments(const QString &platformName) \value LibraryExecutablesPath The path to installed executables required by libraries at runtime. \value BinariesPath The path to installed Qt binaries (tools and applications). \value PluginsPath The path to installed Qt plugins. - \value Qml2ImportsPath The path to installed QML extensions to import (QML 2.x). + \value QmlImportsPath The path to installed QML extensions to import. \value ArchDataPath The path to general architecture-dependent Qt data. \value DataPath The path to general architecture-independent Qt data. \value TranslationsPath The path to translation information for Qt strings. diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h index 04956052b3a..bfb3a9f858c 100644 --- a/src/corelib/global/qlibraryinfo.h +++ b/src/corelib/global/qlibraryinfo.h @@ -65,7 +65,8 @@ public: LibraryExecutablesPath, BinariesPath, PluginsPath, - Qml2ImportsPath, + QmlImportsPath, + Qml2ImportsPath = QmlImportsPath, ArchDataPath, DataPath, TranslationsPath,