Add option to retain sources when generating QML cache

By default any .qrc files are filtered and QML and JS sources dropped
when generating the cache. The new QTQUICK_COMPILER_RETAINED_RESOURCES
option allows the specification of .qrc files to be kept as they are.
The source fils specified in them will be available to the application.

Change-Id: If45bcd95c29fe4b91f5817573964ff55b1db8a00
Fixes: QTBUG-72430
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 11 insertions, 4 deletions

diff --git a/tools/qmlcachegen/generateloader.cpp b/tools/qmlcachegen/generateloader.cpp
index de79576d67..0027d53d00 100644
--- a/tools/qmlcachegen/generateloader.cpp
+++ b/tools/qmlcachegen/generateloader.cpp
@@ -36,6 +36,8 @@
 #include <QFileInfo>
 #include <QSaveFile>
 
+#include <algorithm>
+
 /*!
  * \internal
  * Mangles \a str to be a unique C++ identifier. Characters that are invalid for C++ identifiers
@@ -261,7 +263,8 @@ private:
     }
 };
 
-static QByteArray generateResourceDirectoryTree(QTextStream &code, const QStringList &qrcFiles)
+static QByteArray generateResourceDirectoryTree(QTextStream &code, const QStringList &qrcFiles,
+                                                const QStringList &sortedRetainedFiles)
 {
     QByteArray call;
     if (qrcFiles.isEmpty())
@@ -277,7 +280,8 @@ static QByteArray generateResourceDirectoryTree(QTextStream &code, const QString
 
         for (int i = 0; i < segments.count() - 1; ++i)
             dirEntry = dirEntry->append(segments.at(i));
-        dirEntry->appendEmptyFile(segments.last());
+        if (!std::binary_search(sortedRetainedFiles.begin(), sortedRetainedFiles.end(), entry))
+            dirEntry->appendEmptyFile(segments.last());
     }
 
     if (resourceDirs.isEmpty())
@@ -328,7 +332,9 @@ static QString qtResourceNameForFile(const QString &fileName)
     return name;
 }
 
-bool generateLoader(const QStringList &compiledFiles, const QString &outputFileName, const QStringList &resourceFileMappings, QString *errorString)
+bool generateLoader(const QStringList &compiledFiles, const QStringList &sortedRetainedFiles,
+                    const QString &outputFileName, const QStringList &resourceFileMappings,
+                    QString *errorString)
 {
     QByteArray generatedLoaderCode;
 
@@ -339,7 +345,8 @@ bool generateLoader(const QStringList &compiledFiles, const QString &outputFileN
         stream << "#include <QtCore/qurl.h>\n";
         stream << "\n";
 
-        QByteArray resourceRegisterCall = generateResourceDirectoryTree(stream, compiledFiles);
+        QByteArray resourceRegisterCall = generateResourceDirectoryTree(stream, compiledFiles,
+                                                                        sortedRetainedFiles);
 
         stream << "namespace QmlCacheGeneratedCode {\n";
         for (int i = 0; i < compiledFiles.count(); ++i) {