summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorChristian Kamm <christian.d.kamm@nokia.com>2011-09-21 12:54:10 +0200
committerQt by Nokia <qt-info@nokia.com>2011-09-21 15:28:01 +0200
commit26e15e877fb7db31928e1e90aa50bca841522711 (patch)
tree35bb6bd886ce82353a008cec7527d63b0f82536b /tools
parent43ff44058d75bec6ad1b8a597fe52009c2bee610 (diff)
qmlplugindump: Describe meta object revisions of exported types.
Adds the exportMetaObjectRevisions property to generated qmltypes files. Change-Id: Iafe2fe408c88bb6dd02cbb558404a5f654431248 Reviewed-on: http://codereview.qt-project.org/5311 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/qmlplugindump/main.cpp37
-rw-r--r--tools/qmlplugindump/qmlstreamwriter.cpp16
2 files changed, 41 insertions, 12 deletions
diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp
index c53fd3c7fd..6132d15d0d 100644
--- a/tools/qmlplugindump/main.cpp
+++ b/tools/qmlplugindump/main.cpp
@@ -256,30 +256,43 @@ public:
QSet<const QDeclarativeType *> qmlTypes = qmlTypesByCppName.value(meta->className());
if (!qmlTypes.isEmpty()) {
- QStringList exports;
+ QHash<QString, const QDeclarativeType *> exports;
foreach (const QDeclarativeType *qmlTy, qmlTypes) {
QString qmlTyName = qmlTy->qmlTypeName();
- // some qmltype names are missing the actual names, ignore that import
- if (qmlTyName.endsWith('/'))
- continue;
if (qmlTyName.startsWith(relocatableModuleUri + QLatin1Char('/'))) {
qmlTyName.remove(0, relocatableModuleUri.size() + 1);
}
if (qmlTyName.startsWith("./")) {
qmlTyName.remove(0, 2);
}
- exports += enquote(QString("%1 %2.%3").arg(
- qmlTyName,
- QString::number(qmlTy->majorVersion()),
- QString::number(qmlTy->minorVersion())));
+ if (qmlTyName.startsWith("/")) {
+ qmlTyName.remove(0, 1);
+ }
+ const QString exportString = enquote(
+ QString("%1 %2.%3").arg(
+ qmlTyName,
+ QString::number(qmlTy->majorVersion()),
+ QString::number(qmlTy->minorVersion())));
+ exports.insert(exportString, qmlTy);
}
// ensure exports are sorted and don't change order when the plugin is dumped again
- exports.removeDuplicates();
- qSort(exports);
-
- qml->writeArrayBinding(QLatin1String("exports"), exports);
+ QStringList exportStrings = exports.keys();
+ qSort(exportStrings);
+ qml->writeArrayBinding(QLatin1String("exports"), exportStrings);
+
+ // write meta object revisions unless they're all zero
+ 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);
if (const QMetaObject *attachedType = (*qmlTypes.begin())->attachedPropertiesType()) {
qml->writeScriptBinding(QLatin1String("attachedType"), enquote(
diff --git a/tools/qmlplugindump/qmlstreamwriter.cpp b/tools/qmlplugindump/qmlstreamwriter.cpp
index ca52a7a3f8..a5c110ee3f 100644
--- a/tools/qmlplugindump/qmlstreamwriter.cpp
+++ b/tools/qmlplugindump/qmlstreamwriter.cpp
@@ -110,6 +110,22 @@ void QmlStreamWriter::writeArrayBinding(const QString &name, const QStringList &
{
flushPotentialLinesWithNewlines();
writeIndent();
+
+ // try to use a single line
+ QString singleLine;
+ singleLine += QString("%1: [").arg(name);
+ for (int i = 0; i < elements.size(); ++i) {
+ singleLine += elements.at(i);
+ if (i != elements.size() - 1)
+ singleLine += QLatin1String(", ");
+ }
+ singleLine += QLatin1String("]\n");
+ if (singleLine.size() + m_indentDepth * 4 < 80) {
+ m_stream->write(singleLine.toUtf8());
+ return;
+ }
+
+ // write multi-line
m_stream->write(QString("%1: [\n").arg(name).toUtf8());
++m_indentDepth;
for (int i = 0; i < elements.size(); ++i) {