From 3bbed9ee8f2195b101a177336fd9791caa8772ec Mon Sep 17 00:00:00 2001 From: Fawzi Mohamed Date: Wed, 10 Apr 2013 11:26:16 +0200 Subject: [PATCH] qmlplugindump: always output exportMetaObjectRevisions Some people were confused about exportMetaObjectRevisions, and the "all 0" as default was not expected. Make it explicit so we might change the default in the future. Change-Id: I1f208ba54e2b9aa1a5d46fb9971572467b69ab56 Reviewed-by: Kai Koehne Reviewed-by: Alan Alpert --- tools/qmlplugindump/main.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp index e05c77c..3d816e5 100644 --- a/tools/qmlplugindump/main.cpp +++ b/tools/qmlplugindump/main.cpp @@ -330,17 +330,13 @@ public: qSort(exportStrings); qml->writeArrayBinding(QLatin1String("exports"), exportStrings); - // write meta object revisions unless they're all zero + // write meta object revisions QStringList metaObjectRevisions; - bool shouldWriteMetaObjectRevisions = false; foreach (const QString &exportString, exportStrings) { int metaObjectRevision = exports[exportString]->metaObjectRevision(); - if (metaObjectRevision != 0) - shouldWriteMetaObjectRevisions = true; metaObjectRevisions += QString::number(metaObjectRevision); } - if (shouldWriteMetaObjectRevisions) - qml->writeArrayBinding(QLatin1String("exportMetaObjectRevisions"), metaObjectRevisions); + qml->writeArrayBinding(QLatin1String("exportMetaObjectRevisions"), metaObjectRevisions); if (const QMetaObject *attachedType = (*qmlTypes.begin())->attachedPropertiesType()) { // Can happen when a type is registered that returns itself as attachedPropertiesType() -- 2.7.4