From 26992a29c6ec1697fe6cec3379b37d1c9b203947 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 28 Apr 2022 17:43:38 +0200 Subject: Qml: includemocs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Including moc files directly into their classes' TU tends to improve codegen and enables extended compiler warnings, e.g. about unused private functions or fields. Pick-to: 6.3 6.2 5.15 Task-number: QTBUG-102948 Change-Id: Ie39c60a19ba562affe6bd52ba68b38db95298cf3 Reviewed-by: Qt CI Bot Reviewed-by: MÃ¥rten Nordheim --- src/qml/jsruntime/qv4promiseobject.cpp | 2 ++ src/qml/jsruntime/qv4sequenceobject.cpp | 2 ++ src/qml/qml/qqmlbuiltinfunctions.cpp | 2 ++ src/qml/qml/qqmlengine.cpp | 2 ++ src/qml/qml/qqmlproperty.cpp | 2 ++ src/qml/qml/qqmlscriptstring.cpp | 2 ++ src/qml/qml/qqmltypeloadernetworkreplyproxy.cpp | 2 ++ src/qml/util/qqmlpropertymap.cpp | 2 ++ 8 files changed, 16 insertions(+) (limited to 'src/qml') diff --git a/src/qml/jsruntime/qv4promiseobject.cpp b/src/qml/jsruntime/qv4promiseobject.cpp index 400c5c23b1..d691c46808 100644 --- a/src/qml/jsruntime/qv4promiseobject.cpp +++ b/src/qml/jsruntime/qv4promiseobject.cpp @@ -116,6 +116,8 @@ struct ResolveThenableEvent : public QEvent } // namespace Promise } // namespace QV4 +#include "moc_qv4promiseobject_p.cpp" + ReactionHandler::ReactionHandler(QObject *parent) : QObject(parent) {} diff --git a/src/qml/jsruntime/qv4sequenceobject.cpp b/src/qml/jsruntime/qv4sequenceobject.cpp index a265a67e24..c374a9f3cf 100644 --- a/src/qml/jsruntime/qv4sequenceobject.cpp +++ b/src/qml/jsruntime/qv4sequenceobject.cpp @@ -738,3 +738,5 @@ QMetaType SequencePrototype::metaTypeForSequence(const QV4::Object *object) } QT_END_NAMESPACE + +#include "moc_qv4sequenceobject_p.cpp" diff --git a/src/qml/qml/qqmlbuiltinfunctions.cpp b/src/qml/qml/qqmlbuiltinfunctions.cpp index 565e0a085d..18044e3345 100644 --- a/src/qml/qml/qqmlbuiltinfunctions.cpp +++ b/src/qml/qml/qqmlbuiltinfunctions.cpp @@ -2217,3 +2217,5 @@ ReturnedValue QtObject::method_callLater(const FunctionObject *b, const Value *t } QT_END_NAMESPACE + +#include "moc_qqmlbuiltinfunctions_p.cpp" diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index 3b3213e0d9..5f30eca5b2 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -1996,4 +1996,6 @@ void hasJsOwnershipIndicator(QQmlGuardImpl *) {}; QT_END_NAMESPACE +#include "moc_qqmlengine_p.cpp" + #include "moc_qqmlengine.cpp" diff --git a/src/qml/qml/qqmlproperty.cpp b/src/qml/qml/qqmlproperty.cpp index b841c082b1..d1740f2379 100644 --- a/src/qml/qml/qqmlproperty.cpp +++ b/src/qml/qml/qqmlproperty.cpp @@ -1898,3 +1898,5 @@ void QQmlPropertyPrivate::flushSignal(const QObject *sender, int signal_index) } QT_END_NAMESPACE + +#include "moc_qqmlproperty.cpp" diff --git a/src/qml/qml/qqmlscriptstring.cpp b/src/qml/qml/qqmlscriptstring.cpp index 3230e69b6d..4df3a63785 100644 --- a/src/qml/qml/qqmlscriptstring.cpp +++ b/src/qml/qml/qqmlscriptstring.cpp @@ -220,3 +220,5 @@ bool QQmlScriptString::booleanLiteral(bool *ok) const QT_END_NAMESPACE +#include "moc_qqmlscriptstring.cpp" + diff --git a/src/qml/qml/qqmltypeloadernetworkreplyproxy.cpp b/src/qml/qml/qqmltypeloadernetworkreplyproxy.cpp index af97643163..bcc5306cf8 100644 --- a/src/qml/qml/qqmltypeloadernetworkreplyproxy.cpp +++ b/src/qml/qml/qqmltypeloadernetworkreplyproxy.cpp @@ -72,3 +72,5 @@ void QQmlTypeLoaderNetworkReplyProxy::manualFinished(QNetworkReply *reply) } QT_END_NAMESPACE + +#include "moc_qqmltypeloadernetworkreplyproxy_p.cpp" diff --git a/src/qml/util/qqmlpropertymap.cpp b/src/qml/util/qqmlpropertymap.cpp index 2bf8ab0190..23bf1b307c 100644 --- a/src/qml/util/qqmlpropertymap.cpp +++ b/src/qml/util/qqmlpropertymap.cpp @@ -409,3 +409,5 @@ QQmlPropertyMap::QQmlPropertyMap(const QMetaObject *staticMetaObject, QObject *p */ QT_END_NAMESPACE + +#include "moc_qqmlpropertymap.cpp" -- cgit v1.2.3