From 51f6d418fa803a37e8a1e3bcfdd7f7e02b7bdcad Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Tue, 20 Oct 2020 13:57:38 +0200
Subject: qmlcachegen: Move resourcefilter.cpp into QmlCompiler

For backwards compatibility, a replacement for qmlcachegen will need to
provide the same functionality.

Change-Id: I22664230ea636d384190122223d15819ebee930c
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
---
 tools/qmlcachegen/qmlcachegen.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'tools/qmlcachegen/qmlcachegen.cpp')

diff --git a/tools/qmlcachegen/qmlcachegen.cpp b/tools/qmlcachegen/qmlcachegen.cpp
index 04d31d8887..ca68e7e450 100644
--- a/tools/qmlcachegen/qmlcachegen.cpp
+++ b/tools/qmlcachegen/qmlcachegen.cpp
@@ -41,12 +41,12 @@
 #include <private/qqmljsparser_p.h>
 #include <private/qqmljslexer_p.h>
 #include <private/qqmljsresourcefilemapper_p.h>
+#include <private/qresourcerelocater_p.h>
 
 #include <algorithm>
 
 using namespace QQmlJS;
 
-int filterResourceFile(const QString &input, const QString &output);
 bool generateLoader(const QStringList &compiledFiles, const QString &output,
                     const QStringList &resourceFileMappings, QString *errorString);
 QString symbolNamespaceForPath(const QString &relativePath);
@@ -507,9 +507,8 @@ int main(int argc, char **argv)
     if (outputFileName.isEmpty())
         outputFileName = inputFile + QLatin1Char('c');
 
-    if (parser.isSet(filterResourceFileOption)) {
-        return filterResourceFile(inputFile, outputFileName);
-    }
+    if (parser.isSet(filterResourceFileOption))
+        return qRelocateResourceFile(inputFile, outputFileName);
 
     if (target == GenerateLoader) {
         QQmlJSResourceFileMapper mapper(sources);
-- 
cgit v1.2.3