diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2020-09-25 13:29:50 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-09-25 16:16:21 +0200 |
commit | 0cc0c8535b17adc01525b6d309c3e38fd46d7917 (patch) | |
tree | 65c6cfb1ded6cfd7befcb60f9f5ffd4e86c0da96 /tests | |
parent | 5458f379ac5d5d88dd7f5ddeafd370dbeee3a436 (diff) |
QQmlDirParser: Treat dependencies like imports
In particular, allow auto and latest versions.
Change-Id: I4a6b26112950d066ae2d8a37dc0e9fa1dec24724
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp b/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp index d019285c5b..d53de4fd52 100644 --- a/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp +++ b/tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp @@ -99,6 +99,14 @@ namespace { + QLatin1Char('|') + (c.internal ? "true" : "false"); } + QString toString(const QQmlDirParser::Import &i) + { + return i.module + QLatin1String("||") + + QString::number(i.version.majorVersion()) + QLatin1Char('|') + + QString::number(i.version.minorVersion()) + + QLatin1String("|true"); + } + QStringList toStringList(const QQmlDirComponents &components) { QStringList rv; @@ -110,6 +118,17 @@ namespace { return rv; } + QStringList toStringList(const QQmlDirImports &components) + { + QStringList rv; + + foreach (const QQmlDirParser::Import &c, components) + rv.append(toString(c)); + + std::sort(rv.begin(), rv.end()); + return rv; + } + QString toString(const QQmlDirParser::Script &s) { return s.nameSpace + QLatin1Char('|') + s.fileName + QLatin1Char('|') |