Merge remote-tracking branch 'origin/dev' into wip/cmake

Removed dependencies.yaml because we don't use it yet in wip/cmake.
Fixed conflict in qmlcachegen.cpp.

Change-Id: Ie1060c737bee1daa85779903598e5b6d5020d922

1 files changed, 4 insertions, 10 deletions

diff --git a/tools/qmllint/fakemetaobject.cpp b/tools/qmllint/fakemetaobject.cpp
index 514bb2fe42..8319ae6713 100644
--- a/tools/qmllint/fakemetaobject.cpp
+++ b/tools/qmllint/fakemetaobject.cpp
@@ -46,8 +46,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); }
@@ -73,10 +73,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
@@ -84,16 +80,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;
 }