diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-01-27 17:31:06 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-03-17 14:44:17 +0100 |
| commit | 1eb20d70619cc896fc283bd6605b257a8750c518 (patch) | |
| tree | 1d308932d38759a643d8eef49b211329a2cd5467 /src/qml/qml/qqmltypemoduleversion.cpp | |
| parent | e3c64aff6579f04353608d4b218f031d9137d3f4 (diff) | |
Allow partial and absent version specifiers in import statements
An import statement without version specifier imports the latest version
available, one with only a major version imports the latest minor
version from that major version.
Task-number: QTBUG-71278
Change-Id: I43907ae4e1052be533039d545de5391c41d38307
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/qml/qqmltypemoduleversion.cpp')
| -rw-r--r-- | src/qml/qml/qqmltypemoduleversion.cpp | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/qml/qml/qqmltypemoduleversion.cpp b/src/qml/qml/qqmltypemoduleversion.cpp index 207b77770a..932ff7f503 100644 --- a/src/qml/qml/qqmltypemoduleversion.cpp +++ b/src/qml/qml/qqmltypemoduleversion.cpp @@ -39,9 +39,6 @@ #include "qqmltypemoduleversion_p.h" -#include <private/qqmltype_p.h> -#include <private/qqmltypemodule_p.h> - QT_BEGIN_NAMESPACE QQmlTypeModuleVersion::QQmlTypeModuleVersion() @@ -53,7 +50,6 @@ QQmlTypeModuleVersion::QQmlTypeModuleVersion(QQmlTypeModule *module, QTypeRevisi : m_module(module), m_minor(version.minorVersion()) { Q_ASSERT(m_module); - Q_ASSERT(QTypeRevision::isValidSegment(m_minor)); } QQmlTypeModuleVersion::QQmlTypeModuleVersion(const QQmlTypeModuleVersion &o) @@ -68,18 +64,4 @@ QQmlTypeModuleVersion &QQmlTypeModuleVersion::operator=(const QQmlTypeModuleVers return *this; } -QQmlType QQmlTypeModuleVersion::type(const QHashedStringRef &name) const -{ - if (!m_module) - return QQmlType(); - return m_module->type(name, QTypeRevision::fromMinorVersion(m_minor)); -} - -QQmlType QQmlTypeModuleVersion::type(const QV4::String *name) const -{ - if (!m_module) - return QQmlType(); - return m_module->type(name, QTypeRevision::fromMinorVersion(m_minor)); -} - QT_END_NAMESPACE |