diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2020-10-20 13:57:38 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-10-20 17:19:26 +0200 |
commit | 51f6d418fa803a37e8a1e3bcfdd7f7e02b7bdcad (patch) | |
tree | 389324f114b1172d97fb9d7fbf6073a36628d16e /tools/qmlcachegen/qmlcachegen.cpp | |
parent | 14cd261513174e0006ebdd5b3605347621c7e36b (diff) |
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>
Diffstat (limited to 'tools/qmlcachegen/qmlcachegen.cpp')
-rw-r--r-- | tools/qmlcachegen/qmlcachegen.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
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); |