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

5 files changed, 41 insertions, 314 deletions

diff --git a/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake.in b/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake.in
index 75fbb0fcf3..be2113b258 100644
--- a/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake.in
+++ b/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake.in
@@ -50,13 +50,9 @@ but not all the files it references.
 
         get_filename_component(input_resource ${_resource} ABSOLUTE)
 
-        execute_process(COMMAND ${compiler_path} -filter-resource-file ${input_resource} -o ${new_resource_file} OUTPUT_VARIABLE remaining_files)
-        if(remaining_files)
-            list(APPEND filtered_rcc_files ${new_resource_file})
-            list(APPEND loader_flags \"--resource-file-mapping=${_resource}=${new_resource_file}\")
-        else()
-            list(APPEND loader_flags \"--resource-file-mapping=${_resource}\")
-        endif()
+        execute_process(COMMAND ${compiler_path} --filter-resource-file ${input_resource} -o ${new_resource_file} OUTPUT_VARIABLE remaining_files)
+        list(APPEND filtered_rcc_files ${new_resource_file})
+        list(APPEND loader_flags \"--resource-file-mapping=${_resource}=${new_resource_file}\")
 
         set(rcc_file_with_compilation_units)
 
diff --git a/tools/qmlcachegen/generateloader.cpp b/tools/qmlcachegen/generateloader.cpp
index 1c8a5a016a..71286137eb 100644
--- a/tools/qmlcachegen/generateloader.cpp
+++ b/tools/qmlcachegen/generateloader.cpp
@@ -100,228 +100,6 @@ QString symbolNamespaceForPath(const QString &relativePath)
     return mangledIdentifier(symbol);
 }
 
-struct VirtualDirectoryEntry
-{
-    QString name;
-    QVector<VirtualDirectoryEntry*> dirEntries;
-    int firstChildIndex = -1; // node index inside generated data
-    bool isDirectory = true;
-
-    VirtualDirectoryEntry()
-    {}
-
-    ~VirtualDirectoryEntry()
-    {
-        qDeleteAll(dirEntries);
-    }
-
-    VirtualDirectoryEntry *append(const QString &name)
-    {
-        for (QVector<VirtualDirectoryEntry*>::Iterator it = dirEntries.begin(), end = dirEntries.end();
-             it != end; ++it) {
-            if ((*it)->name == name)
-                return *it;
-        }
-
-        VirtualDirectoryEntry *subEntry = new VirtualDirectoryEntry;
-        subEntry->name = name;
-        dirEntries.append(subEntry);
-        return subEntry;
-    }
-
-    void appendEmptyFile(const QString &name)
-    {
-        VirtualDirectoryEntry *subEntry = new VirtualDirectoryEntry;
-        subEntry->name = name;
-        subEntry->isDirectory = false;
-        dirEntries.append(subEntry);
-    }
-
-    bool isEmpty() const { return dirEntries.isEmpty(); }
-};
-
-struct DataStream
-{
-    DataStream(QVector<unsigned char > *data = nullptr)
-        : data(data)
-    {}
-
-    qint64 currentOffset() const { return data->size(); }
-
-    DataStream &operator<<(quint16 value)
-    {
-        unsigned char d[2];
-        qToBigEndian(value, d);
-        data->append(d[0]);
-        data->append(d[1]);
-        return *this;
-    }
-    DataStream &operator<<(quint32 value)
-    {
-        unsigned char d[4];
-        qToBigEndian(value, d);
-        data->append(d[0]);
-        data->append(d[1]);
-        data->append(d[2]);
-        data->append(d[3]);
-        return *this;
-    }
-private:
-    QVector<unsigned char> *data;
-};
-
-static bool resource_sort_order(const VirtualDirectoryEntry *lhs, const VirtualDirectoryEntry *rhs)
-{
-    return qt_hash(lhs->name) < qt_hash(rhs->name);
-}
-
-struct ResourceTree
-{
-    ResourceTree()
-    {}
-
-    void serialize(VirtualDirectoryEntry &root, QVector<unsigned char> *treeData, QVector<unsigned char> *stringData)
-    {
-        treeStream = DataStream(treeData);
-        stringStream = DataStream(stringData);
-
-        QStack<VirtualDirectoryEntry *> directories;
-
-        {
-            directories.push(&root);
-            while (!directories.isEmpty()) {
-                VirtualDirectoryEntry *entry = directories.pop();
-                registerString(entry->name);
-                if (entry->isDirectory)
-                    directories << entry->dirEntries;
-            }
-        }
-
-        {
-            quint32 currentDirectoryIndex = 1;
-            directories.push(&root);
-            while (!directories.isEmpty()) {
-                VirtualDirectoryEntry *entry = directories.pop();
-                entry->firstChildIndex = currentDirectoryIndex;
-                currentDirectoryIndex += entry->dirEntries.count();
-                std::sort(entry->dirEntries.begin(), entry->dirEntries.end(), resource_sort_order);
-
-                for (QVector<VirtualDirectoryEntry*>::ConstIterator child = entry->dirEntries.constBegin(), end = entry->dirEntries.constEnd();
-                     child != end; ++child) {
-                    if ((*child)->isDirectory)
-                        directories << *child;
-                }
-            }
-        }
-
-        {
-            writeTreeEntry(&root);
-            directories.push(&root);
-            while (!directories.isEmpty()) {
-                VirtualDirectoryEntry *entry = directories.pop();
-
-                for (QVector<VirtualDirectoryEntry*>::ConstIterator child = entry->dirEntries.constBegin(), end = entry->dirEntries.constEnd();
-                     child != end; ++child) {
-                    writeTreeEntry(*child);
-                    if ((*child)->isDirectory)
-                        directories << (*child);
-                }
-            }
-        }
-    }
-
-private:
-    DataStream treeStream;
-    DataStream stringStream;
-    QHash<QString, qint64> stringOffsets;
-
-    void registerString(const QString &name)
-    {
-        if (stringOffsets.contains(name))
-            return;
-        const qint64 offset = stringStream.currentOffset();
-        stringOffsets.insert(name, offset);
-
-        stringStream << quint16(name.length())
-                     << quint32(qt_hash(name));
-        for (int i = 0; i < name.length(); ++i)
-            stringStream << quint16(name.at(i).unicode());
-    }
-
-    void writeTreeEntry(VirtualDirectoryEntry *entry)
-    {
-        treeStream << quint32(stringOffsets.value(entry->name))
-                   << quint16(entry->isDirectory ? 0x2 : 0x0); // Flags: File or Directory
-
-        if (entry->isDirectory) {
-            treeStream << quint32(entry->dirEntries.count())
-                       << quint32(entry->firstChildIndex);
-        } else {
-            treeStream << quint16(QLocale::AnyCountry) << quint16(QLocale::C)
-                       << quint32(0x0);
-        }
-    }
-};
-
-static QByteArray generateResourceDirectoryTree(QTextStream &code, const QStringList &qrcFiles,
-                                                const QStringList &sortedRetainedFiles)
-{
-    QByteArray call;
-    if (qrcFiles.isEmpty())
-        return call;
-
-    VirtualDirectoryEntry resourceDirs;
-    resourceDirs.name = QStringLiteral("/");
-
-    for (const QString &entry : qrcFiles) {
-        const QStringList segments = entry.split(QLatin1Char('/'), QString::SkipEmptyParts);
-
-        VirtualDirectoryEntry *dirEntry = &resourceDirs;
-
-        for (int i = 0; i < segments.count() - 1; ++i)
-            dirEntry = dirEntry->append(segments.at(i));
-        if (!std::binary_search(sortedRetainedFiles.begin(), sortedRetainedFiles.end(), entry))
-            dirEntry->appendEmptyFile(segments.last());
-    }
-
-    if (resourceDirs.isEmpty())
-        return call;
-
-    QVector<unsigned char> names;
-    QVector<unsigned char> tree;
-    ResourceTree().serialize(resourceDirs, &tree, &names);
-
-    code << "static const unsigned char qt_resource_tree[] = {\n";
-    for (int i = 0; i < tree.count(); ++i) {
-        code << uint(tree.at(i));
-        if (i < tree.count() - 1)
-            code << ',';
-        if (i % 16 == 0)
-            code << '\n';
-    }
-    code << "};\n";
-
-    code << "static const unsigned char qt_resource_names[] = {\n";
-    for (int i = 0; i < names.count(); ++i) {
-        code << uint(names.at(i));
-        if (i < names.count() - 1)
-            code << ',';
-        if (i % 16 == 0)
-            code << '\n';
-    }
-    code << "};\n";
-
-    code << "static const unsigned char qt_resource_empty_payout[] = { 0, 0, 0, 0, 0 };\n";
-
-    code << "QT_BEGIN_NAMESPACE\n";
-    code << "extern Q_CORE_EXPORT bool qRegisterResourceData(int, const unsigned char *, const unsigned char *, const unsigned char *);\n";
-    code << "QT_END_NAMESPACE\n";
-
-    call = "QT_PREPEND_NAMESPACE(qRegisterResourceData)(/*version*/0x01, qt_resource_tree, qt_resource_names, qt_resource_empty_payout);\n";
-
-    return call;
-}
-
 static QString qtResourceNameForFile(const QString &fileName)
 {
     QFileInfo fi(fileName);
@@ -332,9 +110,8 @@ static QString qtResourceNameForFile(const QString &fileName)
     return name;
 }
 
-bool generateLoader(const QStringList &compiledFiles, const QStringList &sortedRetainedFiles,
-                    const QString &outputFileName, const QStringList &resourceFileMappings,
-                    QString *errorString)
+bool generateLoader(const QStringList &compiledFiles, const QString &outputFileName,
+                    const QStringList &resourceFileMappings, QString *errorString)
 {
     QByteArray generatedLoaderCode;
 
@@ -345,9 +122,6 @@ bool generateLoader(const QStringList &compiledFiles, const QStringList &sortedR
         stream << "#include <QtCore/qurl.h>\n";
         stream << "\n";
 
-        QByteArray resourceRegisterCall = generateResourceDirectoryTree(stream, compiledFiles,
-                                                                        sortedRetainedFiles);
-
         stream << "namespace QmlCacheGeneratedCode {\n";
         for (int i = 0; i < compiledFiles.count(); ++i) {
             const QString compiledFile = compiledFiles.at(i);
@@ -385,9 +159,6 @@ bool generateLoader(const QStringList &compiledFiles, const QStringList &sortedR
         stream << "    registration.lookupCachedQmlUnit = &lookupCachedUnit;\n";
         stream << "    QQmlPrivate::qmlregister(QQmlPrivate::QmlUnitCacheHookRegistration, &registration);\n";
 
-        if (!resourceRegisterCall.isEmpty())
-            stream << resourceRegisterCall;
-
         stream << "}\n\n";
         stream << "Registry::~Registry() {\n";
         stream << "    QQmlPrivate::qmlunregister(QQmlPrivate::QmlUnitCacheHookRegistration, quintptr(&lookupCachedUnit));\n";
diff --git a/tools/qmlcachegen/qmlcachegen.cpp b/tools/qmlcachegen/qmlcachegen.cpp
index 6e96b88c0c..d1b28c41f5 100644
--- a/tools/qmlcachegen/qmlcachegen.cpp
+++ b/tools/qmlcachegen/qmlcachegen.cpp
@@ -48,9 +48,8 @@
 using namespace QQmlJS;
 
 int filterResourceFile(const QString &input, const QString &output);
-bool generateLoader(const QStringList &compiledFiles, const QStringList &retainedFiles,
-                    const QString &output, const QStringList &resourceFileMappings,
-                    QString *errorString);
+bool generateLoader(const QStringList &compiledFiles, const QString &output,
+                    const QStringList &resourceFileMappings, QString *errorString);
 QString symbolNamespaceForPath(const QString &relativePath);
 
 QSet<QString> illegalNames;
@@ -455,8 +454,6 @@ int main(int argc, char **argv)
     parser.addOption(resourceFileMappingOption);
     QCommandLineOption resourceOption(QStringLiteral("resource"), QCoreApplication::translate("main", "Qt resource file that might later contain one of the compiled files"), QCoreApplication::translate("main", "resource-file-name"));
     parser.addOption(resourceOption);
-    QCommandLineOption retainOption(QStringLiteral("retain"), QCoreApplication::translate("main", "Qt resource file the contents of which should not be replaced by empty stubs"), QCoreApplication::translate("main", "resource-file-name"));
-    parser.addOption(retainOption);
     QCommandLineOption resourcePathOption(QStringLiteral("resource-path"), QCoreApplication::translate("main", "Qt resource file path corresponding to the file being compiled"), QCoreApplication::translate("main", "resource-path"));
     parser.addOption(resourcePathOption);
     QCommandLineOption resourceNameOption(QStringLiteral("resource-name"),
@@ -517,12 +514,9 @@ int main(int argc, char **argv)
 
     if (target == GenerateLoader) {
         ResourceFileMapper mapper(sources);
-        ResourceFileMapper retain(parser.values(retainOption));
 
         Error error;
-        QStringList retainedFiles = retain.qmlCompilerFiles();
-        std::sort(retainedFiles.begin(), retainedFiles.end());
-        if (!generateLoader(mapper.qmlCompilerFiles(), retainedFiles, outputFileName,
+        if (!generateLoader(mapper.qmlCompilerFiles(), outputFileName,
                             parser.values(resourceFileMappingOption), &error.message)) {
             error.augment(QLatin1String("Error generating loader stub: ")).print();
             return EXIT_FAILURE;
@@ -531,10 +525,8 @@ int main(int argc, char **argv)
     }
 
     if (target == GenerateLoaderStandAlone) {
-        QStringList retainedFiles = parser.values(retainOption);
-        retainedFiles.sort();
         Error error;
-        if (!generateLoader(sources, retainedFiles, outputFileName,
+        if (!generateLoader(sources, outputFileName,
                             parser.values(resourceNameOption), &error.message)) {
             error.augment(QLatin1String("Error generating loader stub: ")).print();
             return EXIT_FAILURE;
diff --git a/tools/qmlcachegen/qtquickcompiler.prf b/tools/qmlcachegen/qtquickcompiler.prf
index 2f98aadefe..a31a7f5714 100644
--- a/tools/qmlcachegen/qtquickcompiler.prf
+++ b/tools/qmlcachegen/qtquickcompiler.prf
@@ -1,5 +1,15 @@
 if(qtc_run|lupdate_run): return()
 
+!contains(QT, qml) {
+    qt_modules = \
+        $$replace(QT, -private$, _private) \
+        $$replace(QT_PRIVATE, -private$, _private)
+    qt_modules = $$resolve_depends(qt_modules, "QT.", ".depends" ".run_depends")
+    !contains(qt_modules, qml): \
+        return()
+    unset(qt_modules)
+}
+
 qtPrepareTool(QML_CACHEGEN, qmlcachegen, _FILTER)
 qtPrepareTool(QMAKE_RCC, rcc, _DEP)
 
@@ -16,20 +26,6 @@ defineReplace(qmlCacheResourceFileOutputName) {
     return($${name})
 }
 
-defineTest(qtQuickRetainSources) {
-    for(retainedRes, QTQUICK_COMPILER_RETAINED_RESOURCES) {
-        equals(1, $$retainedRes): return(true)
-    }
-    return(false)
-}
-
-defineTest(qtQuickSkippedResourceFile) {
-    for(skippedRes, QTQUICK_COMPILER_SKIPPED_RESOURCES) {
-        equals(1, $$skippedRes): return(true)
-    }
-    return(false)
-}
-
 # Flatten RESOURCES that may contain individual files or objects
 load(resources)
 
@@ -37,29 +33,14 @@ NEWRESOURCES =
 QMLCACHE_RESOURCE_FILES =
 
 for(res, RESOURCES) {
-    qtQuickSkippedResourceFile($$res) {
-        NEWRESOURCES += $$res
-        next()
-    }
-
     absRes = $$absolute_path($$res, $$_PRO_FILE_PWD_)
     rccContents = $$system($$QMAKE_RCC_DEP -list $$system_quote($$absRes),lines)
     contains(rccContents,.*\\.js$)|contains(rccContents,.*\\.qml$)|contains(rccContents,.*\\.mjs$) {
         new_resource = $$qmlCacheResourceFileOutputName($$res)
         mkpath($$dirname(new_resource))
-        qtQuickRetainSources($$res) {
-            NEWRESOURCES += $$res
-            QMLCACHE_LOADER_FLAGS += --retain=$$shell_quote($$absRes)
-        } else {
-            remaining_files = $$system($$QML_CACHEGEN_FILTER -filter-resource-file \
-                    -o $$system_quote($$new_resource) $$system_quote($$absRes),lines)
-            !isEmpty(remaining_files) {
-                NEWRESOURCES += $$new_resource
-                QMLCACHE_LOADER_FLAGS += --resource-file-mapping=$$shell_quote($$absRes=$$new_resource)
-            } else {
-                QMLCACHE_LOADER_FLAGS += --resource-file-mapping=$$shell_quote($$absRes)
-            }
-        }
+        dummy = $$system($$QML_CACHEGEN_FILTER --filter-resource-file -o $$system_quote($$new_resource) $$system_quote($$absRes))
+        NEWRESOURCES += $$new_resource
+        QMLCACHE_LOADER_FLAGS += --resource-file-mapping=$$shell_quote($$absRes=$$new_resource)
 
         QMLCACHE_RESOURCE_FILES += $$absRes
 
diff --git a/tools/qmlcachegen/resourcefilter.cpp b/tools/qmlcachegen/resourcefilter.cpp
index 3ad6e9ca0d..261102dcbe 100644
--- a/tools/qmlcachegen/resourcefilter.cpp
+++ b/tools/qmlcachegen/resourcefilter.cpp
@@ -57,8 +57,6 @@ int filterResourceFile(const QString &input, const QString &output)
     QXmlStreamWriter writer(&outputString);
     writer.setAutoFormatting(true);
 
-    QStringList remainingFiles;
-
     QXmlStreamReader reader(&file);
     while (!reader.atEnd()) {
         switch (reader.readNext()) {
@@ -139,47 +137,36 @@ int filterResourceFile(const QString &input, const QString &output)
             if (currentFileName.isEmpty())
                 continue;
 
-            if (!currentFileName.endsWith(QStringLiteral(".qml"))
-                && !currentFileName.endsWith(QStringLiteral(".js"))
-                && !currentFileName.endsWith(QStringLiteral(".mjs"))) {
-                writer.writeStartElement(QStringLiteral("file"));
-
-                if (!fileAttributes.hasAttribute(QStringLiteral("alias")))
-                    fileAttributes.append(QStringLiteral("alias"), currentFileName);
+            writer.writeStartElement(QStringLiteral("file"));
 
-                currentFileName = inputDirectory.absoluteFilePath(currentFileName);
-                currentFileName = outputDirectory.relativeFilePath(currentFileName);
+            if (!fileAttributes.hasAttribute(QStringLiteral("alias")))
+                fileAttributes.append(QStringLiteral("alias"), currentFileName);
 
-                remainingFiles << currentFileName;
+            currentFileName = inputDirectory.absoluteFilePath(currentFileName);
+            currentFileName = outputDirectory.relativeFilePath(currentFileName);
 
-                writer.writeAttributes(fileAttributes);
-                writer.writeCharacters(currentFileName);
-                writer.writeEndElement();
-            }
+            writer.writeAttributes(fileAttributes);
+            writer.writeCharacters(currentFileName);
+            writer.writeEndElement();
             continue;
 
         default: break;
     }
     }
 
-    if (!remainingFiles.isEmpty()) {
-        QFile outputFile(output);
-        if (!outputFile.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
-            fprintf(stderr, "Cannot open %s for writing.\n", qPrintable(output));
-            return EXIT_FAILURE;
-        }
-        const QByteArray outputStringUtf8 = outputString.toUtf8();
-        if (outputFile.write(outputStringUtf8) != outputStringUtf8.size())
-            return EXIT_FAILURE;
+    QFile outputFile(output);
+    if (!outputFile.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
+        fprintf(stderr, "Cannot open %s for writing.\n", qPrintable(output));
+        return EXIT_FAILURE;
+    }
+    const QByteArray outputStringUtf8 = outputString.toUtf8();
+    if (outputFile.write(outputStringUtf8) != outputStringUtf8.size())
+        return EXIT_FAILURE;
 
-        outputFile.close();
-        if (outputFile.error() != QFileDevice::NoError)
-            return EXIT_FAILURE;
+    outputFile.close();
+    if (outputFile.error() != QFileDevice::NoError)
+        return EXIT_FAILURE;
 
-        // The build system expects this output if we wrote a qrc file and no output
-        // if no files remain.
-        fprintf(stdout, "New resource file written with %d files.\n", remainingFiles.count());
-    }
 
     return EXIT_SUCCESS;
 }