aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/qml/Qt6QmlMacros.cmake5
-rw-r--r--tools/qmlcachegen/qmlcachegen.cpp5
2 files changed, 10 insertions, 0 deletions
diff --git a/src/qml/Qt6QmlMacros.cmake b/src/qml/Qt6QmlMacros.cmake
index b9cee43b17..b89f824280 100644
--- a/src/qml/Qt6QmlMacros.cmake
+++ b/src/qml/Qt6QmlMacros.cmake
@@ -959,6 +959,11 @@ function(_qt_internal_quick_compiler_process_resources target resource_name)
set(chained_resource_name "${resource_name}_qmlcache")
endif()
+ get_target_property(qmltypes ${target} QT_QML_MODULE_PLUGIN_TYPES_FILE)
+ if (qmltypes)
+ list(APPEND qmlcachegen_extra_args "-i" ${qmltypes})
+ endif()
+
get_target_property(direct_calls ${target} QT_QMLCACHEGEN_DIRECT_CALLS)
if (direct_calls)
list(APPEND qmlcachegen_extra_args "--direct-calls")
diff --git a/tools/qmlcachegen/qmlcachegen.cpp b/tools/qmlcachegen/qmlcachegen.cpp
index c56b647c9a..84d5d5550c 100644
--- a/tools/qmlcachegen/qmlcachegen.cpp
+++ b/tools/qmlcachegen/qmlcachegen.cpp
@@ -104,9 +104,14 @@ int main(int argc, char **argv)
QCoreApplication::translate("main", "compiled-file-list"));
parser.addOption(resourceNameOption);
QCommandLineOption directCallsOption(QStringLiteral("direct-calls"), QCoreApplication::translate("main", "This option is ignored."));
+ directCallsOption.setFlags(QCommandLineOption::HiddenFromHelp);
parser.addOption(directCallsOption);
QCommandLineOption qmlJSRuntimeOption(QStringLiteral("qmljs-runtime"), QCoreApplication::translate("main", "This option is ignored."));
+ qmlJSRuntimeOption.setFlags(QCommandLineOption::HiddenFromHelp);
parser.addOption(qmlJSRuntimeOption);
+ QCommandLineOption includesOption(QStringLiteral("i"), QCoreApplication::translate("main", "This option is ignored."), QCoreApplication::translate("main", "ignored file"));
+ includesOption.setFlags(QCommandLineOption::HiddenFromHelp);
+ parser.addOption(includesOption);
QCommandLineOption outputFileOption(QStringLiteral("o"), QCoreApplication::translate("main", "Output file name"), QCoreApplication::translate("main", "file name"));
parser.addOption(outputFileOption);