diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2021-02-22 15:57:43 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2021-02-23 13:54:33 +0100 |
| commit | 1e089ad28dae8b86c2e7e3022b09b976e0ee7b80 (patch) | |
| tree | 399e065b9bc7f9142de3fccc2ae60b55a10cfafb /tools/qmlcachegen | |
| parent | 454da9f721addad786f7e21c0a14f26edfef595a (diff) | |
qmlcachegen: Accept both --resource and --resource-path
--resource-path directly specifies the resource path for the file being
compiled and overrides any information we might retrieve from the qrc
file. However, we might still find other relevant information in the qrc
file.
Change-Id: I587c6e4e81f792f62a28b035ee97b33d12eeb06d
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tools/qmlcachegen')
| -rw-r--r-- | tools/qmlcachegen/qmlcachegen.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/tools/qmlcachegen/qmlcachegen.cpp b/tools/qmlcachegen/qmlcachegen.cpp index 84d5d5550c..a011442528 100644 --- a/tools/qmlcachegen/qmlcachegen.cpp +++ b/tools/qmlcachegen/qmlcachegen.cpp @@ -191,13 +191,6 @@ int main(int argc, char **argv) QQmlJSResourceFileMapper fileMapper(parser.values(resourceOption)); QString inputResourcePath = parser.value(resourcePathOption); - if (!inputResourcePath.isEmpty() && !fileMapper.isEmpty()) { - fprintf(stderr, "--%s and --%s are mutually exclusive.\n", - qPrintable(resourcePathOption.names().first()), - qPrintable(resourceOption.names().first())); - return EXIT_FAILURE; - } - // If the user didn't specify the resource path corresponding to the file on disk being // compiled, try to determine it from the resource file, if one was supplied. if (inputResourcePath.isEmpty()) { |