diff options
| -rw-r--r-- | tools/qmlcachegen/qmlcache.prf | 5 | ||||
| -rw-r--r-- | tools/qmlcachegen/qmlcachegen.cpp | 10 |
2 files changed, 4 insertions, 11 deletions
diff --git a/tools/qmlcachegen/qmlcache.prf b/tools/qmlcachegen/qmlcache.prf index 330da358b7..dfb06cb760 100644 --- a/tools/qmlcachegen/qmlcache.prf +++ b/tools/qmlcachegen/qmlcache.prf @@ -20,11 +20,6 @@ else:QML_CACHEGEN_ABI=$$QT_BUILDABI QML_CACHEGEN_ARGS=--target-architecture=$$QML_CACHEGEN_ARCH --target-abi=$$QML_CACHEGEN_ABI -!system($$QML_CACHEGEN_ARCH_CHECK $$QML_CACHEGEN_ARGS --check-if-supported) { - message("QML cache generation requested but target architecture $$QML_CACHEGEN_ARCH is not supported.") - return() -} - load(qt_build_paths) prefix_build: QMLCACHE_DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH diff --git a/tools/qmlcachegen/qmlcachegen.cpp b/tools/qmlcachegen/qmlcachegen.cpp index d8af157b8e..807a213f14 100644 --- a/tools/qmlcachegen/qmlcachegen.cpp +++ b/tools/qmlcachegen/qmlcachegen.cpp @@ -345,12 +345,10 @@ int main(int argc, char **argv) return EXIT_FAILURE; } -// if (parser.isSet(checkIfSupportedOption)) { -// if (isel.isNull()) -// return EXIT_FAILURE; -// else -// return EXIT_SUCCESS; -// } + // Since we're now storing bytecode in the cache, the --check-if-supported option + // doesn't make sense anymore. Return EXIT_SUCCESS for backwards compatibility. + if (parser.isSet(checkIfSupportedOption)) + return EXIT_SUCCESS; const QStringList sources = parser.positionalArguments(); if (sources.isEmpty()){ |