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

Change-Id: I48b9c2e4f3a75c18470c55f73f2089dc1401de54

4 files changed, 42 insertions, 293 deletions

diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp
index 5e999c557a..1556718471 100644
--- a/tools/qmlplugindump/main.cpp
+++ b/tools/qmlplugindump/main.cpp
@@ -380,23 +380,21 @@ public:
         relocatableModuleUri = uri;
     }
 
-    const QString getExportString(QString qmlTyName, int majorVersion, int minorVersion)
+    QString getExportString(const QQmlType &type, const QmlVersionInfo &versionInfo)
     {
-        if (qmlTyName.startsWith(relocatableModuleUri + QLatin1Char('/'))) {
-            qmlTyName.remove(0, relocatableModuleUri.size() + 1);
-        }
-        if (qmlTyName.startsWith("./")) {
-            qmlTyName.remove(0, 2);
-        }
-        if (qmlTyName.startsWith(QLatin1Char('/'))) {
-            qmlTyName.remove(0, 1);
-        }
-        const QString exportString = enquote(
-                    QString("%1 %2.%3").arg(
-                        qmlTyName,
-                        QString::number(majorVersion),
-                        QString::number(minorVersion)));
-        return exportString;
+        const QString module = type.module().isEmpty() ? versionInfo.pluginImportUri
+                                                       : type.module();
+        const int majorVersion = type.majorVersion() >= 0 ? type.majorVersion()
+                                                          : versionInfo.majorVersion;
+        const int minorVersion = type.minorVersion() >= 0 ? type.minorVersion()
+                                                          : versionInfo.minorVersion;
+
+        const QString versionedElement = type.elementName()
+                + QString::fromLatin1(" %1.%2").arg(majorVersion).arg(minorVersion);
+
+        return enquote((module == relocatableModuleUri)
+                       ? versionedElement
+                       : module + QLatin1Char('/') + versionedElement);
     }
 
     void writeMetaContent(const QMetaObject *meta, KnownAttributes *knownAttributes = nullptr)
@@ -441,8 +439,9 @@ public:
         }
     }
 
-    QString getPrototypeNameForCompositeType(const QMetaObject *metaObject, QSet<QByteArray> &defaultReachableNames,
-                                             QList<const QMetaObject *> *objectsToMerge, const QmlVersionInfo &versionInfo)
+    QString getPrototypeNameForCompositeType(
+            const QMetaObject *metaObject, QList<const QMetaObject *> *objectsToMerge,
+            const QmlVersionInfo &versionInfo)
     {
         auto ty = QQmlMetaType::qmlType(metaObject);
         QString prototypeName;
@@ -454,24 +453,28 @@ public:
                     && !objectsToMerge->contains(metaObject))
                 objectsToMerge->append(metaObject);
             const QMetaObject *superMetaObject = metaObject->superClass();
-            if (!superMetaObject)
+            if (!superMetaObject) {
                 prototypeName = "QObject";
-            else
+            } else {
+                QQmlType superType = QQmlMetaType::qmlType(superMetaObject);
+                if (superType.isValid() && !superType.isComposite())
+                    return convertToId(superMetaObject->className());
                 prototypeName = getPrototypeNameForCompositeType(
-                            superMetaObject, defaultReachableNames, objectsToMerge, versionInfo);
+                            superMetaObject, objectsToMerge, versionInfo);
+            }
         } else {
             prototypeName = convertToId(metaObject->className());
         }
         return prototypeName;
     }
 
-    void dumpComposite(QQmlEngine *engine, const QList<QQmlType> &compositeType, QSet<QByteArray> &defaultReachableNames,  const QmlVersionInfo &versionInfo)
+    void dumpComposite(QQmlEngine *engine, const QList<QQmlType> &compositeType, const QmlVersionInfo &versionInfo)
     {
         for (const QQmlType &type : compositeType)
-            dumpCompositeItem(engine, type, defaultReachableNames, versionInfo);
+            dumpCompositeItem(engine, type, versionInfo);
     }
 
-    void dumpCompositeItem(QQmlEngine *engine, const QQmlType &compositeType, QSet<QByteArray> &defaultReachableNames, const QmlVersionInfo &versionInfo)
+    void dumpCompositeItem(QQmlEngine *engine, const QQmlType &compositeType, const QmlVersionInfo &versionInfo)
     {
         QQmlComponent e(engine, compositeType.sourceUrl());
         if (!e.isReady()) {
@@ -492,13 +495,17 @@ public:
         QList<const QMetaObject *> objectsToMerge;
         KnownAttributes knownAttributes;
         // Get C++ base class name for the composite type
-        QString prototypeName = getPrototypeNameForCompositeType(mainMeta, defaultReachableNames,
-                                                                 &objectsToMerge, versionInfo);
+        QString prototypeName = getPrototypeNameForCompositeType(mainMeta, &objectsToMerge,
+                                                                 versionInfo);
         qml->writeScriptBinding(QLatin1String("prototype"), enquote(prototypeName));
 
         QString qmlTyName = compositeType.qmlTypeName();
-        const QString exportString = getExportString(qmlTyName, compositeType.majorVersion(), compositeType.minorVersion());
+        const QString exportString = getExportString(compositeType, versionInfo);
+
+        // TODO: why don't we simply output the compositeType.elementName() here?
+        //       That would make more sense, but it would change the format quite a bit.
         qml->writeScriptBinding(QLatin1String("name"), exportString);
+
         qml->writeArrayBinding(QLatin1String("exports"), QStringList() << exportString);
         qml->writeArrayBinding(QLatin1String("exportMetaObjectRevisions"), QStringList() << QString::number(compositeType.minorVersion()));
         qml->writeBooleanBinding(QLatin1String("isComposite"), true);
@@ -565,7 +572,7 @@ public:
                 if (attachedType != meta)
                     attachedTypeId = convertToId(attachedType);
             }
-            const QString exportString = getExportString(type.qmlTypeName(), type.majorVersion(), type.minorVersion());
+            const QString exportString = getExportString(type, { QString(), -1, -1, false });
             int metaObjectRevision = type.metaObjectRevision();
             if (extendedObject) {
                 // emulate custom metaobjectrevision out of import
@@ -1239,9 +1246,6 @@ int main(int argc, char *argv[])
     QSet<const QMetaObject *> uncreatableMetas;
     QSet<const QMetaObject *> singletonMetas;
 
-    // QQuickKeyEvent, QQuickPinchEvent, QQuickDropEvent are not exported
-    QSet<QByteArray> defaultReachableNames;
-
     // this will hold the meta objects we want to dump information of
     QSet<const QMetaObject *> metas;
 
@@ -1370,7 +1374,7 @@ int main(int argc, char *argv[])
 
     QMap<QString, QList<QQmlType>>::const_iterator iter = compositeTypes.constBegin();
     for (; iter != compositeTypes.constEnd(); ++iter)
-        dumper.dumpComposite(&engine, iter.value(), defaultReachableNames, info);
+        dumper.dumpComposite(&engine, iter.value(), info);
 
     // define QEasingCurve as an extension of QQmlEasingValueType, this way
     // properties using the QEasingCurve type get useful type information.
diff --git a/tools/qmlplugindump/qmlplugindump.pro b/tools/qmlplugindump/qmlplugindump.pro
index 62b08e9334..e374ae45f4 100644
--- a/tools/qmlplugindump/qmlplugindump.pro
+++ b/tools/qmlplugindump/qmlplugindump.pro
@@ -5,14 +5,16 @@ CONFIG += no_import_scan
 
 QTPLUGIN.platforms = qminimal
 
+INCLUDEPATH += ../shared
+
 SOURCES += \
     main.cpp \
-    qmlstreamwriter.cpp \
-    qmltypereader.cpp
+    qmltypereader.cpp \
+    ../shared/qmlstreamwriter.cpp
 
 HEADERS += \
-    qmlstreamwriter.h \
-    qmltypereader.h
+    qmltypereader.h \
+    ../shared/qmlstreamwriter.h
 
 macx {
     # Prevent qmlplugindump from popping up in the dock when launched.
diff --git a/tools/qmlplugindump/qmlstreamwriter.cpp b/tools/qmlplugindump/qmlstreamwriter.cpp
deleted file mode 100644
index b0fbc4e443..0000000000
--- a/tools/qmlplugindump/qmlstreamwriter.cpp
+++ /dev/null
@@ -1,190 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlstreamwriter.h"
-
-#include <QtCore/QBuffer>
-#include <QtCore/QStringList>
-
-QmlStreamWriter::QmlStreamWriter(QByteArray *array)
-    : m_indentDepth(0)
-    , m_pendingLineLength(0)
-    , m_maybeOneline(false)
-    , m_stream(new QBuffer(array))
-{
-    m_stream->open(QIODevice::WriteOnly);
-}
-
-void QmlStreamWriter::writeStartDocument()
-{
-}
-
-void QmlStreamWriter::writeEndDocument()
-{
-}
-
-void QmlStreamWriter::writeLibraryImport(const QString &uri, int majorVersion, int minorVersion, const QString &as)
-{
-    m_stream->write(QString::fromLatin1("import %1 %2.%3").arg(uri, QString::number(majorVersion), QString::number(minorVersion)).toUtf8());
-    if (!as.isEmpty())
-        m_stream->write(QString::fromLatin1(" as %1").arg(as).toUtf8());
-    m_stream->write("\n");
-}
-
-void QmlStreamWriter::writeStartObject(const QString &component)
-{
-    flushPotentialLinesWithNewlines();
-    writeIndent();
-    m_stream->write(QString::fromLatin1("%1 {").arg(component).toUtf8());
-    ++m_indentDepth;
-    m_maybeOneline = true;
-}
-
-void QmlStreamWriter::writeEndObject()
-{
-    if (m_maybeOneline && !m_pendingLines.isEmpty()) {
-        --m_indentDepth;
-        for (int i = 0; i < m_pendingLines.size(); ++i) {
-            m_stream->write(" ");
-            m_stream->write(m_pendingLines.at(i).trimmed());
-            if (i != m_pendingLines.size() - 1)
-                m_stream->write(";");
-        }
-        m_stream->write(" }\n");
-        m_pendingLines.clear();
-        m_pendingLineLength = 0;
-        m_maybeOneline = false;
-    } else {
-        flushPotentialLinesWithNewlines();
-        --m_indentDepth;
-        writeIndent();
-        m_stream->write("}\n");
-    }
-}
-
-void QmlStreamWriter::writeScriptBinding(const QString &name, const QString &rhs)
-{
-    writePotentialLine(QString::fromLatin1("%1: %2").arg(name, rhs).toUtf8());
-}
-
-void QmlStreamWriter::writeBooleanBinding(const QString &name, bool value)
-{
-    writeScriptBinding(name, value ? QLatin1String("true") : QLatin1String("false"));
-}
-
-void QmlStreamWriter::writeArrayBinding(const QString &name, const QStringList &elements)
-{
-    flushPotentialLinesWithNewlines();
-    writeIndent();
-
-    // try to use a single line
-    QString singleLine;
-    singleLine += QString::fromLatin1("%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::fromLatin1("%1: [\n").arg(name).toUtf8());
-    ++m_indentDepth;
-    for (int i = 0; i < elements.size(); ++i) {
-        writeIndent();
-        m_stream->write(elements.at(i).toUtf8());
-        if (i != elements.size() - 1) {
-            m_stream->write(",\n");
-        } else {
-            m_stream->write("\n");
-        }
-    }
-    --m_indentDepth;
-    writeIndent();
-    m_stream->write("]\n");
-}
-
-void QmlStreamWriter::write(const QString &data)
-{
-    flushPotentialLinesWithNewlines();
-    m_stream->write(data.toUtf8());
-}
-
-void QmlStreamWriter::writeScriptObjectLiteralBinding(const QString &name, const QList<QPair<QString, QString> > &keyValue)
-{
-    flushPotentialLinesWithNewlines();
-    writeIndent();
-    m_stream->write(QString::fromLatin1("%1: {\n").arg(name).toUtf8());
-    ++m_indentDepth;
-    for (int i = 0; i < keyValue.size(); ++i) {
-        const QString key = keyValue.at(i).first;
-        const QString value = keyValue.at(i).second;
-        writeIndent();
-        m_stream->write(QString::fromLatin1("%1: %2").arg(key, value).toUtf8());
-        if (i != keyValue.size() - 1) {
-            m_stream->write(",\n");
-        } else {
-            m_stream->write("\n");
-        }
-    }
-    --m_indentDepth;
-    writeIndent();
-    m_stream->write("}\n");
-}
-
-void QmlStreamWriter::writeIndent()
-{
-    m_stream->write(QByteArray(m_indentDepth * 4, ' '));
-}
-
-void QmlStreamWriter::writePotentialLine(const QByteArray &line)
-{
-    m_pendingLines.append(line);
-    m_pendingLineLength += line.size();
-    if (m_pendingLineLength >= 80) {
-        flushPotentialLinesWithNewlines();
-    }
-}
-
-void QmlStreamWriter::flushPotentialLinesWithNewlines()
-{
-    if (m_maybeOneline)
-        m_stream->write("\n");
-    for (const QByteArray &line : qAsConst(m_pendingLines)) {
-        writeIndent();
-        m_stream->write(line);
-        m_stream->write("\n");
-    }
-    m_pendingLines.clear();
-    m_pendingLineLength = 0;
-    m_maybeOneline = false;
-}
diff --git a/tools/qmlplugindump/qmlstreamwriter.h b/tools/qmlplugindump/qmlstreamwriter.h
deleted file mode 100644
index cb642159ea..0000000000
--- a/tools/qmlplugindump/qmlstreamwriter.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the tools applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLSTREAMWRITER_H
-#define QMLSTREAMWRITER_H
-
-#include <QtCore/QIODevice>
-#include <QtCore/QList>
-#include <QtCore/QString>
-#include <QtCore/QScopedPointer>
-#include <QtCore/QPair>
-
-class QmlStreamWriter
-{
-public:
-    QmlStreamWriter(QByteArray *array);
-
-    void writeStartDocument();
-    void writeEndDocument();
-    void writeLibraryImport(const QString &uri, int majorVersion, int minorVersion, const QString &as = QString());
-    //void writeFilesystemImport(const QString &file, const QString &as = QString());
-    void writeStartObject(const QString &component);
-    void writeEndObject();
-    void writeScriptBinding(const QString &name, const QString &rhs);
-    void writeScriptObjectLiteralBinding(const QString &name, const QList<QPair<QString, QString> > &keyValue);
-    void writeArrayBinding(const QString &name, const QStringList &elements);
-    void write(const QString &data);
-    void writeBooleanBinding(const QString &name, bool value);
-
-private:
-    void writeIndent();
-    void writePotentialLine(const QByteArray &line);
-    void flushPotentialLinesWithNewlines();
-
-    int m_indentDepth;
-    QList<QByteArray> m_pendingLines;
-    int m_pendingLineLength;
-    bool m_maybeOneline;
-    QScopedPointer<QIODevice> m_stream;
-};
-
-#endif // QMLSTREAMWRITER_H