diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2019-08-29 10:38:36 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-09-30 08:24:30 +0000 |
commit | b5b1367b0b37133c9666a5d20c95d53e5e6d6a43 (patch) | |
tree | 7ec23b1e40957f3dec907ff21548c571689540f2 /src/libs/languageutils/fakemetaobject.cpp | |
parent | 1bf23a6c74c18b1f89d17cbc9bfc2f93056020bc (diff) |
Accept arrays as enum descriptions in qmltypes files
We don't use the values at all and they are hard to determine
statically. Qt >= 5.15 will generated arrays instead of objects.
Change-Id: I3b3bbd427c49e649ca3f9cef51c89b32e830eb66
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'src/libs/languageutils/fakemetaobject.cpp')
-rw-r--r-- | src/libs/languageutils/fakemetaobject.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/libs/languageutils/fakemetaobject.cpp b/src/libs/languageutils/fakemetaobject.cpp index 1a6579b6e3..3d8866972b 100644 --- a/src/libs/languageutils/fakemetaobject.cpp +++ b/src/libs/languageutils/fakemetaobject.cpp @@ -44,8 +44,8 @@ QString FakeMetaEnum::name() const void FakeMetaEnum::setName(const QString &name) { m_name = name; } -void FakeMetaEnum::addKey(const QString &key, int value) -{ m_keys.append(key); m_values.append(value); } +void FakeMetaEnum::addKey(const QString &key) +{ m_keys.append(key); } QString FakeMetaEnum::key(int index) const { return m_keys.at(index); } @@ -71,10 +71,6 @@ void FakeMetaEnum::addToHash(QCryptographicHash &hash) const hash.addData(reinterpret_cast<const char *>(&len), sizeof(len)); hash.addData(reinterpret_cast<const char *>(key.constData()), len * sizeof(QChar)); } - len = m_values.size(); - hash.addData(reinterpret_cast<const char *>(&len), sizeof(len)); - foreach (int value, m_values) - hash.addData(reinterpret_cast<const char *>(&value), sizeof(value)); } QString FakeMetaEnum::describe(int baseIndent) const @@ -82,16 +78,14 @@ QString FakeMetaEnum::describe(int baseIndent) const QString newLine = QString::fromLatin1("\n") + QString::fromLatin1(" ").repeated(baseIndent); QString res = QLatin1String("Enum "); res += name(); - res += QLatin1String(":{"); + res += QLatin1String(": ["); for (int i = 0; i < keyCount(); ++i) { res += newLine; res += QLatin1String(" "); res += key(i); - res += QLatin1String(": "); - res += QString::number(m_values.value(i, -1)); } res += newLine; - res += QLatin1Char('}'); + res += QLatin1Char(']'); return res; } |