Build optimization: include all moc cpps directly in the main cpp file

This is a Qt module policy and helps a lot with build times -- especially
on CI setups.

Change-Id: I90574deb7e7b215054a5037b99ee4e7c7a040568
Reviewed-by: Thomas Senyk <thomas.senyk@qt.io>

75 files changed, 153 insertions, 3 deletions

diff --git a/examples/applicationmanager/application-features/imports/terminator2/qmlterminator2.cpp b/examples/applicationmanager/application-features/imports/terminator2/qmlterminator2.cpp
index ae03e600..d4abcd61 100644
--- a/examples/applicationmanager/application-features/imports/terminator2/qmlterminator2.cpp
+++ b/examples/applicationmanager/application-features/imports/terminator2/qmlterminator2.cpp
@@ -104,3 +104,5 @@ void TerminatorThread::run()
 {
     m_terminator->accessIllegalMemory();
 }
+
+#include "moc_qmlterminator2.cpp"
diff --git a/examples/applicationmanager/softwarecontainer-plugin/softwarecontainer.cpp b/examples/applicationmanager/softwarecontainer-plugin/softwarecontainer.cpp
index 2598f6aa..de2f4d37 100644
--- a/examples/applicationmanager/softwarecontainer-plugin/softwarecontainer.cpp
+++ b/examples/applicationmanager/softwarecontainer-plugin/softwarecontainer.cpp
@@ -599,3 +599,5 @@ void SoftwareContainer::containerExited(uint exitCode)
     emit finished(WEXITSTATUS(exitCode), WIFEXITED(exitCode) ? NormalExit : CrashExit);
     deleteLater();
 }
+
+#include "moc_softwarecontainer.cpp"
diff --git a/src/application-lib/applicationinfo.cpp b/src/application-lib/applicationinfo.cpp
index 5a1a4aef..fa9abd49 100644
--- a/src/application-lib/applicationinfo.cpp
+++ b/src/application-lib/applicationinfo.cpp
@@ -208,7 +208,7 @@ QStringList ApplicationInfo::supportedMimeTypes() const
     return m_supportedMimeTypes;
 }
 
-QString QtAM::ApplicationInfo::documentUrl() const
+QString ApplicationInfo::documentUrl() const
 {
     return m_documentUrl;
 }
diff --git a/src/application-lib/applicationinterface.cpp b/src/application-lib/applicationinterface.cpp
index 78f7c3c9..b133fb4f 100644
--- a/src/application-lib/applicationinterface.cpp
+++ b/src/application-lib/applicationinterface.cpp
@@ -197,3 +197,5 @@
     a MIME-type request. In the latter case \a mimeType contains the MIME-type detected
     by the application manager.
 */
+
+#include "moc_applicationinterface.cpp"
diff --git a/src/common-lib/startuptimer.cpp b/src/common-lib/startuptimer.cpp
index 1344f645..abd64052 100644
--- a/src/common-lib/startuptimer.cpp
+++ b/src/common-lib/startuptimer.cpp
@@ -494,3 +494,5 @@ quint64 StartupTimer::systemUpTime() const
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_startuptimer.cpp"
diff --git a/src/common-lib/unixsignalhandler.cpp b/src/common-lib/unixsignalhandler.cpp
index dc1f8747..9be308bc 100644
--- a/src/common-lib/unixsignalhandler.cpp
+++ b/src/common-lib/unixsignalhandler.cpp
@@ -245,3 +245,5 @@ UnixSignalHandler::SigHandler::SigHandler(int signal, bool qt, const std::functi
 
 
 QT_END_NAMESPACE_AM
+
+#include "moc_unixsignalhandler.cpp"
diff --git a/src/dbus-lib/abstractdbuscontextadaptor.cpp b/src/dbus-lib/abstractdbuscontextadaptor.cpp
index aee9a521..21dc7986 100644
--- a/src/dbus-lib/abstractdbuscontextadaptor.cpp
+++ b/src/dbus-lib/abstractdbuscontextadaptor.cpp
@@ -61,3 +61,5 @@ QDBusContext *AbstractDBusContextAdaptor::dbusContextFor(QDBusAbstractAdaptor *a
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_abstractdbuscontextadaptor.cpp"
diff --git a/src/intent-client-lib/intentclient.cpp b/src/intent-client-lib/intentclient.cpp
index 56892ffe..bbd483a7 100644
--- a/src/intent-client-lib/intentclient.cpp
+++ b/src/intent-client-lib/intentclient.cpp
@@ -307,3 +307,5 @@ void IntentClient::errorReplyFromApplication(IntentClientRequest *icr, const QSt
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_intentclient.cpp"
diff --git a/src/intent-client-lib/intentclientrequest.cpp b/src/intent-client-lib/intentclientrequest.cpp
index a736cc08..5f8bdea9 100644
--- a/src/intent-client-lib/intentclientrequest.cpp
+++ b/src/intent-client-lib/intentclientrequest.cpp
@@ -368,3 +368,5 @@ void IntentClientRequest::doFinish()
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_intentclientrequest.cpp"
diff --git a/src/intent-client-lib/intentclientsysteminterface.cpp b/src/intent-client-lib/intentclientsysteminterface.cpp
index 9be9a140..7173b9e6 100644
--- a/src/intent-client-lib/intentclientsysteminterface.cpp
+++ b/src/intent-client-lib/intentclientsysteminterface.cpp
@@ -58,3 +58,5 @@ void IntentClientSystemInterface::initialize(IntentClient *intentClient)
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_intentclientsysteminterface.cpp"
diff --git a/src/intent-client-lib/intenthandler.cpp b/src/intent-client-lib/intenthandler.cpp
index 0e336b42..76f9a018 100644
--- a/src/intent-client-lib/intenthandler.cpp
+++ b/src/intent-client-lib/intenthandler.cpp
@@ -154,3 +154,5 @@ bool IntentHandler::isComponentCompleted() const
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_intenthandler.cpp"
diff --git a/src/intent-server-lib/intent.cpp b/src/intent-server-lib/intent.cpp
index 8979fe56..5d6461f5 100644
--- a/src/intent-server-lib/intent.cpp
+++ b/src/intent-server-lib/intent.cpp
@@ -253,3 +253,5 @@ QStringList Intent::categories() const
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_intent.cpp"
diff --git a/src/intent-server-lib/intentmodel.cpp b/src/intent-server-lib/intentmodel.cpp
index f4b1a76a..2382314f 100644
--- a/src/intent-server-lib/intentmodel.cpp
+++ b/src/intent-server-lib/intentmodel.cpp
@@ -283,3 +283,5 @@ QJSEngine *IntentModel::getJSEngine() const
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_intentmodel.cpp"
diff --git a/src/intent-server-lib/intentserver.cpp b/src/intent-server-lib/intentserver.cpp
index 5a65ae6b..0aa518ff 100644
--- a/src/intent-server-lib/intentserver.cpp
+++ b/src/intent-server-lib/intentserver.cpp
@@ -823,3 +823,5 @@ IntentServerRequest *IntentServer::requestToSystem(const QString &requestingAppl
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_intentserver.cpp"
diff --git a/src/intent-server-lib/intentserverrequest.cpp b/src/intent-server-lib/intentserverrequest.cpp
index 059d20e8..5375bb94 100644
--- a/src/intent-server-lib/intentserverrequest.cpp
+++ b/src/intent-server-lib/intentserverrequest.cpp
@@ -132,3 +132,5 @@ void IntentServerRequest::setHandlingApplicationId(const QString &applicationId)
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_intentserverrequest.cpp"
diff --git a/src/intent-server-lib/intentserversysteminterface.cpp b/src/intent-server-lib/intentserversysteminterface.cpp
index f6552c02..6ba4fd41 100644
--- a/src/intent-server-lib/intentserversysteminterface.cpp
+++ b/src/intent-server-lib/intentserversysteminterface.cpp
@@ -71,3 +71,5 @@ IntentServerRequest *IntentServerSystemInterface::requestToSystem(const QString
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_intentserversysteminterface.cpp"
diff --git a/src/launcher-lib/applicationmanagerwindow.cpp b/src/launcher-lib/applicationmanagerwindow.cpp
index 041990e0..daba3bed 100644
--- a/src/launcher-lib/applicationmanagerwindow.cpp
+++ b/src/launcher-lib/applicationmanagerwindow.cpp
@@ -198,3 +198,5 @@ QVariantMap ApplicationManagerWindow::windowProperties() const
 
 
 QT_END_NAMESPACE_AM
+
+#include "moc_applicationmanagerwindow_p.cpp"
diff --git a/src/launcher-lib/dbusapplicationinterface.cpp b/src/launcher-lib/dbusapplicationinterface.cpp
index ab505f81..d7697d8f 100644
--- a/src/launcher-lib/dbusapplicationinterface.cpp
+++ b/src/launcher-lib/dbusapplicationinterface.cpp
@@ -267,3 +267,5 @@ void DBusApplicationInterface::notificationActionTriggered(uint notificationId,
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_dbusapplicationinterface.cpp"
diff --git a/src/launcher-lib/dbusapplicationinterfaceextension.cpp b/src/launcher-lib/dbusapplicationinterfaceextension.cpp
index 080156ba..4a725313 100644
--- a/src/launcher-lib/dbusapplicationinterfaceextension.cpp
+++ b/src/launcher-lib/dbusapplicationinterfaceextension.cpp
@@ -171,3 +171,5 @@ void DBusApplicationInterfaceExtension::onInterfaceCreated(const QString &interf
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_dbusapplicationinterfaceextension.cpp"
diff --git a/src/launcher-lib/ipcwrapperobject.cpp b/src/launcher-lib/ipcwrapperobject.cpp
index 0d3035f2..d20ee5a3 100644
--- a/src/launcher-lib/ipcwrapperobject.cpp
+++ b/src/launcher-lib/ipcwrapperobject.cpp
@@ -368,3 +368,5 @@ void IpcWrapperSignalRelay::onPropertiesChanged(const QString &interfaceName, co
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_ipcwrapperobject_p.cpp"
diff --git a/src/launcher-lib/launchermain.cpp b/src/launcher-lib/launchermain.cpp
index f1440a01..9c98563c 100644
--- a/src/launcher-lib/launchermain.cpp
+++ b/src/launcher-lib/launchermain.cpp
@@ -274,3 +274,5 @@ void LauncherMain::setupDBusConnections() Q_DECL_NOEXCEPT_EXPR(false)
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_launchermain.cpp"
diff --git a/src/launcher-lib/waylandqtamclientextension.cpp b/src/launcher-lib/waylandqtamclientextension.cpp
index 58c3955a..69cd7dac 100644
--- a/src/launcher-lib/waylandqtamclientextension.cpp
+++ b/src/launcher-lib/waylandqtamclientextension.cpp
@@ -149,3 +149,5 @@ void WaylandQtAMClientExtension::qtam_extension_window_property_changed(wl_surfa
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_waylandqtamclientextension_p.cpp"
diff --git a/src/main-lib/applicationinstaller.cpp b/src/main-lib/applicationinstaller.cpp
index 524bad2e..7ecc8585 100644
--- a/src/main-lib/applicationinstaller.cpp
+++ b/src/main-lib/applicationinstaller.cpp
@@ -343,3 +343,5 @@ QObject *ApplicationInstaller::instanceForQml(QQmlEngine *, QJSEngine *)
 */
 
 QT_END_NAMESPACE_AM
+
+#include "moc_applicationinstaller.cpp"
diff --git a/src/main-lib/configuration.cpp b/src/main-lib/configuration.cpp
index f7c01015..f390549a 100644
--- a/src/main-lib/configuration.cpp
+++ b/src/main-lib/configuration.cpp
@@ -1002,7 +1002,7 @@ bool Configuration::verbose() const
     return value<bool>("verbose") || m_forceVerbose;
 }
 
-void QtAM::Configuration::setForceVerbose(bool forceVerbose)
+void Configuration::setForceVerbose(bool forceVerbose)
 {
     m_forceVerbose = forceVerbose;
 }
diff --git a/src/main-lib/main.cpp b/src/main-lib/main.cpp
index b1d0bb76..d28b4195 100644
--- a/src/main-lib/main.cpp
+++ b/src/main-lib/main.cpp
@@ -1107,3 +1107,5 @@ QString Main::hardwareId() const
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_main.cpp"
diff --git a/src/main-lib/windowframetimer.cpp b/src/main-lib/windowframetimer.cpp
index c240023e..549bf3a8 100644
--- a/src/main-lib/windowframetimer.cpp
+++ b/src/main-lib/windowframetimer.cpp
@@ -119,3 +119,5 @@ void WindowFrameTimer::disconnectFromWaylandSurface()
 
 
 QT_END_NAMESPACE_AM
+
+#include "moc_windowframetimer.cpp"
diff --git a/src/manager-lib/abstractcontainer.cpp b/src/manager-lib/abstractcontainer.cpp
index 6a5c8c80..63545af3 100644
--- a/src/manager-lib/abstractcontainer.cpp
+++ b/src/manager-lib/abstractcontainer.cpp
@@ -177,3 +177,5 @@ void AbstractContainerManager::setConfiguration(const QVariantMap &configuration
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_abstractcontainer.cpp"
diff --git a/src/manager-lib/abstractruntime.cpp b/src/manager-lib/abstractruntime.cpp
index 857d43a0..7bb270aa 100644
--- a/src/manager-lib/abstractruntime.cpp
+++ b/src/manager-lib/abstractruntime.cpp
@@ -256,3 +256,5 @@ void AbstractRuntimeManager::setIconTheme(const QStringList &themeSearchPaths, c
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_abstractruntime.cpp"
diff --git a/src/manager-lib/application.cpp b/src/manager-lib/application.cpp
index 8b810660..8f8f6694 100644
--- a/src/manager-lib/application.cpp
+++ b/src/manager-lib/application.cpp
@@ -501,3 +501,5 @@ QDebug operator<<(QDebug debug, const QT_PREPEND_NAMESPACE_AM(Application) *app)
         debug << "(null)";
     return debug;
 }
+
+#include "moc_application.cpp"
diff --git a/src/manager-lib/applicationipcinterface.cpp b/src/manager-lib/applicationipcinterface.cpp
index 43a48172..7928a851 100644
--- a/src/manager-lib/applicationipcinterface.cpp
+++ b/src/manager-lib/applicationipcinterface.cpp
@@ -753,3 +753,5 @@ bool ApplicationIPCInterfaceAttached::resolveProxy() const
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_applicationipcinterface.cpp"
diff --git a/src/manager-lib/applicationipcmanager.cpp b/src/manager-lib/applicationipcmanager.cpp
index eec0c355..3b04eb52 100644
--- a/src/manager-lib/applicationipcmanager.cpp
+++ b/src/manager-lib/applicationipcmanager.cpp
@@ -338,3 +338,5 @@ void ApplicationIPCManager::registerInterfaces(AbstractRuntime *runtime, const Q
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_applicationipcmanager.cpp"
diff --git a/src/manager-lib/applicationmanager.cpp b/src/manager-lib/applicationmanager.cpp
index cd851327..d0565130 100644
--- a/src/manager-lib/applicationmanager.cpp
+++ b/src/manager-lib/applicationmanager.cpp
@@ -1460,3 +1460,5 @@ void ApplicationManager::removeApplication(ApplicationInfo *appInfo, Package *pa
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_applicationmanager.cpp"
diff --git a/src/manager-lib/applicationmodel.cpp b/src/manager-lib/applicationmodel.cpp
index 06434601..cddba99f 100644
--- a/src/manager-lib/applicationmodel.cpp
+++ b/src/manager-lib/applicationmodel.cpp
@@ -292,3 +292,5 @@ QJSEngine *ApplicationModel::getJSEngine() const
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_applicationmodel.cpp"
diff --git a/src/manager-lib/asynchronoustask.cpp b/src/manager-lib/asynchronoustask.cpp
index 4b1b9e67..e4a3b8bd 100644
--- a/src/manager-lib/asynchronoustask.cpp
+++ b/src/manager-lib/asynchronoustask.cpp
@@ -131,3 +131,5 @@ void AsynchronousTask::run()
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_asynchronoustask.cpp"
diff --git a/src/manager-lib/containerfactory.cpp b/src/manager-lib/containerfactory.cpp
index c8ff91c0..6e89e863 100644
--- a/src/manager-lib/containerfactory.cpp
+++ b/src/manager-lib/containerfactory.cpp
@@ -123,3 +123,5 @@ bool ContainerFactory::registerContainer(AbstractContainerManager *manager, cons
 
 
 QT_END_NAMESPACE_AM
+
+#include "moc_containerfactory.cpp"
diff --git a/src/manager-lib/deinstallationtask.cpp b/src/manager-lib/deinstallationtask.cpp
index 0530cf23..bcb21b6f 100644
--- a/src/manager-lib/deinstallationtask.cpp
+++ b/src/manager-lib/deinstallationtask.cpp
@@ -158,3 +158,5 @@ void DeinstallationTask::execute()
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_deinstallationtask.cpp"
diff --git a/src/manager-lib/inprocesssurfaceitem.cpp b/src/manager-lib/inprocesssurfaceitem.cpp
index 7de480ad..07bcb6ed 100644
--- a/src/manager-lib/inprocesssurfaceitem.cpp
+++ b/src/manager-lib/inprocesssurfaceitem.cpp
@@ -167,3 +167,5 @@ void InProcessSurfaceItem::close()
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_inprocesssurfaceitem.cpp"
diff --git a/src/manager-lib/installationtask.cpp b/src/manager-lib/installationtask.cpp
index 2784e922..c6320e5b 100644
--- a/src/manager-lib/installationtask.cpp
+++ b/src/manager-lib/installationtask.cpp
@@ -467,3 +467,5 @@ void InstallationTask::finishInstallation() Q_DECL_NOEXCEPT_EXPR(false)
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_installationtask.cpp"
diff --git a/src/manager-lib/intentaminterface.cpp b/src/manager-lib/intentaminterface.cpp
index 4fc8d7df..afa3dfaa 100644
--- a/src/manager-lib/intentaminterface.cpp
+++ b/src/manager-lib/intentaminterface.cpp
@@ -770,3 +770,5 @@ void IntentServerHandler::componentComplete()
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_intentaminterface.cpp"
diff --git a/src/manager-lib/nativeruntime.cpp b/src/manager-lib/nativeruntime.cpp
index b88457e2..7edb5c49 100644
--- a/src/manager-lib/nativeruntime.cpp
+++ b/src/manager-lib/nativeruntime.cpp
@@ -602,3 +602,7 @@ AbstractRuntime *NativeRuntimeManager::create(AbstractContainer *container, Appl
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_nativeruntime.cpp"
+
+#include "moc_nativeruntime_p.cpp"
diff --git a/src/manager-lib/notificationmanager.cpp b/src/manager-lib/notificationmanager.cpp
index 387e968b..3d1a32c0 100644
--- a/src/manager-lib/notificationmanager.cpp
+++ b/src/manager-lib/notificationmanager.cpp
@@ -669,3 +669,5 @@ void NotificationManagerPrivate::closeNotification(uint id, CloseReason reason)
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_notificationmanager.cpp"
diff --git a/src/manager-lib/package.cpp b/src/manager-lib/package.cpp
index f58b418d..47363252 100644
--- a/src/manager-lib/package.cpp
+++ b/src/manager-lib/package.cpp
@@ -388,3 +388,5 @@ void Package::removeApplication(Application *application)
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_package.cpp"
diff --git a/src/manager-lib/packagemanager.cpp b/src/manager-lib/packagemanager.cpp
index bd952ad7..d8ec8a6f 100644
--- a/src/manager-lib/packagemanager.cpp
+++ b/src/manager-lib/packagemanager.cpp
@@ -1582,3 +1582,5 @@ bool removeRecursiveHelper(const QString &path)
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_packagemanager.cpp"
diff --git a/src/manager-lib/plugincontainer.cpp b/src/manager-lib/plugincontainer.cpp
index 32f334c0..f73ecb99 100644
--- a/src/manager-lib/plugincontainer.cpp
+++ b/src/manager-lib/plugincontainer.cpp
@@ -187,3 +187,5 @@ void PluginContainerProcess::terminate()
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_plugincontainer.cpp"
diff --git a/src/manager-lib/processcontainer.cpp b/src/manager-lib/processcontainer.cpp
index 1bf9d10d..05e2ad58 100644
--- a/src/manager-lib/processcontainer.cpp
+++ b/src/manager-lib/processcontainer.cpp
@@ -331,3 +331,5 @@ AbstractContainer *ProcessContainerManager::create(Application *app, const QVect
 
 QT_END_NAMESPACE_AM
 
+
+#include "moc_processcontainer.cpp"
diff --git a/src/manager-lib/processstatus.cpp b/src/manager-lib/processstatus.cpp
index c16da4f1..675916c0 100644
--- a/src/manager-lib/processstatus.cpp
+++ b/src/manager-lib/processstatus.cpp
@@ -390,3 +390,5 @@ QStringList ProcessStatus::roleNames() const
 {
     return { qSL("cpuLoad"), qSL("memoryVirtual"), qSL("memoryRss"), qSL("memoryPss") };
 }
+
+#include "moc_processstatus.cpp"
diff --git a/src/manager-lib/qmlinprocessapplicationinterface.cpp b/src/manager-lib/qmlinprocessapplicationinterface.cpp
index d742e49e..d5e89122 100644
--- a/src/manager-lib/qmlinprocessapplicationinterface.cpp
+++ b/src/manager-lib/qmlinprocessapplicationinterface.cpp
@@ -315,3 +315,5 @@ void QmlInProcessApplicationInterfaceExtension::setName(const QString &name)
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_qmlinprocessapplicationinterface.cpp"
diff --git a/src/manager-lib/qmlinprocessapplicationmanagerwindow.cpp b/src/manager-lib/qmlinprocessapplicationmanagerwindow.cpp
index a7836f31..58462ed7 100644
--- a/src/manager-lib/qmlinprocessapplicationmanagerwindow.cpp
+++ b/src/manager-lib/qmlinprocessapplicationmanagerwindow.cpp
@@ -367,3 +367,5 @@ void QmlInProcessApplicationManagerWindow::setOpacity(qreal value)
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_qmlinprocessapplicationmanagerwindow.cpp"
diff --git a/src/manager-lib/qmlinprocessruntime.cpp b/src/manager-lib/qmlinprocessruntime.cpp
index b1bd2e74..010e37c6 100644
--- a/src/manager-lib/qmlinprocessruntime.cpp
+++ b/src/manager-lib/qmlinprocessruntime.cpp
@@ -388,3 +388,5 @@ AbstractRuntime *QmlInProcessRuntimeManager::create(AbstractContainer *container
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_qmlinprocessruntime.cpp"
diff --git a/src/manager-lib/quicklauncher.cpp b/src/manager-lib/quicklauncher.cpp
index ce61b974..194470e9 100644
--- a/src/manager-lib/quicklauncher.cpp
+++ b/src/manager-lib/quicklauncher.cpp
@@ -272,3 +272,5 @@ void QuickLauncher::shutDown()
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_quicklauncher.cpp"
diff --git a/src/manager-lib/runtimefactory.cpp b/src/manager-lib/runtimefactory.cpp
index bf00c31a..30583f1d 100644
--- a/src/manager-lib/runtimefactory.cpp
+++ b/src/manager-lib/runtimefactory.cpp
@@ -169,3 +169,5 @@ bool RuntimeFactory::registerRuntime(AbstractRuntimeManager *manager, const QStr
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_runtimefactory.cpp"
diff --git a/src/monitor-lib/processreader.cpp b/src/monitor-lib/processreader.cpp
index 31c096d2..096eadf0 100644
--- a/src/monitor-lib/processreader.cpp
+++ b/src/monitor-lib/processreader.cpp
@@ -358,3 +358,5 @@ bool ProcessReader::readMemory(Memory &mem)
 }
 
 #endif
+
+#include "moc_processreader.cpp"
diff --git a/src/monitor-lib/systemreader.cpp b/src/monitor-lib/systemreader.cpp
index 3feaa813..64088bce 100644
--- a/src/monitor-lib/systemreader.cpp
+++ b/src/monitor-lib/systemreader.cpp
@@ -854,3 +854,5 @@ void MemoryWatcher::checkMemoryConsumption()
 QT_END_NAMESPACE_AM
 
 #endif // !defined(Q_OS_LINUX)
+
+#include "moc_systemreader.cpp"
diff --git a/src/notification-lib/notification.cpp b/src/notification-lib/notification.cpp
index 9583dee7..5813ac82 100644
--- a/src/notification-lib/notification.cpp
+++ b/src/notification-lib/notification.cpp
@@ -628,3 +628,5 @@ void Notification::libnotifyNotificationClosed(uint reason)
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_notification.cpp"
diff --git a/src/package-lib/packagecreator.cpp b/src/package-lib/packagecreator.cpp
index 717bb5f5..57dd9e99 100644
--- a/src/package-lib/packagecreator.cpp
+++ b/src/package-lib/packagecreator.cpp
@@ -424,3 +424,5 @@ void PackageCreatorPrivate::setError(Error errorCode, const QString &errorString
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_packagecreator.cpp"
diff --git a/src/package-lib/packageextractor.cpp b/src/package-lib/packageextractor.cpp
index 29c1d27b..99a660f3 100644
--- a/src/package-lib/packageextractor.cpp
+++ b/src/package-lib/packageextractor.cpp
@@ -577,3 +577,7 @@ void PackageExtractorPrivate::downloadProgressChanged(qint64 downloaded, qint64
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_packageextractor.cpp"
+
+#include "moc_packageextractor_p.cpp"
diff --git a/src/shared-main-lib/cpustatus.cpp b/src/shared-main-lib/cpustatus.cpp
index b98891cc..d801b454 100644
--- a/src/shared-main-lib/cpustatus.cpp
+++ b/src/shared-main-lib/cpustatus.cpp
@@ -147,3 +147,5 @@ QStringList CpuStatus::roleNames() const
 {
     return { qSL("cpuLoad") };
 }
+
+#include "moc_cpustatus.cpp"
diff --git a/src/shared-main-lib/frametimer.cpp b/src/shared-main-lib/frametimer.cpp
index 7751599b..fbb5057e 100644
--- a/src/shared-main-lib/frametimer.cpp
+++ b/src/shared-main-lib/frametimer.cpp
@@ -321,3 +321,5 @@ void FrameTimer::setInterval(int value)
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_frametimer.cpp"
diff --git a/src/shared-main-lib/gpustatus.cpp b/src/shared-main-lib/gpustatus.cpp
index 76fd8fa5..c5ff6d9a 100644
--- a/src/shared-main-lib/gpustatus.cpp
+++ b/src/shared-main-lib/gpustatus.cpp
@@ -160,3 +160,5 @@ QStringList GpuStatus::roleNames() const
     return { qSL("gpuLoad") };
 }
 
+
+#include "moc_gpustatus.cpp"
diff --git a/src/shared-main-lib/iostatus.cpp b/src/shared-main-lib/iostatus.cpp
index 8c771015..c0713f7d 100644
--- a/src/shared-main-lib/iostatus.cpp
+++ b/src/shared-main-lib/iostatus.cpp
@@ -187,3 +187,5 @@ void IoStatus::addIoReader(const QString &deviceName)
     IoReader *ior = new IoReader(deviceName.toLocal8Bit().constData());
     m_ioHash.insert(deviceName, ior);
 }
+
+#include "moc_iostatus.cpp"
diff --git a/src/shared-main-lib/memorystatus.cpp b/src/shared-main-lib/memorystatus.cpp
index 730f5894..f9c62599 100644
--- a/src/shared-main-lib/memorystatus.cpp
+++ b/src/shared-main-lib/memorystatus.cpp
@@ -155,3 +155,5 @@ void MemoryStatus::update()
         emit memoryUsedChanged();
     }
 }
+
+#include "moc_memorystatus.cpp"
diff --git a/src/shared-main-lib/monitormodel.cpp b/src/shared-main-lib/monitormodel.cpp
index 1433b608..5bc9e858 100644
--- a/src/shared-main-lib/monitormodel.cpp
+++ b/src/shared-main-lib/monitormodel.cpp
@@ -496,3 +496,5 @@ QVariantMap MonitorModel::get(int row) const
 
     return map;
 }
+
+#include "moc_monitormodel.cpp"
diff --git a/src/shared-main-lib/qmllogger.cpp b/src/shared-main-lib/qmllogger.cpp
index b40bfc52..d210ef2a 100644
--- a/src/shared-main-lib/qmllogger.cpp
+++ b/src/shared-main-lib/qmllogger.cpp
@@ -75,3 +75,5 @@ void QmlLogger::warnings(const QList<QQmlError> &list)
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_qmllogger.cpp"
diff --git a/src/tools/launcher-qml/launcher-qml.cpp b/src/tools/launcher-qml/launcher-qml.cpp
index 00457896..78c39267 100644
--- a/src/tools/launcher-qml/launcher-qml.cpp
+++ b/src/tools/launcher-qml/launcher-qml.cpp
@@ -652,3 +652,5 @@ void HeadlessIncubationController::timerEvent(QTimerEvent *)
 {
     incubateFor(25);
 }
+
+#include "moc_launcher-qml_p.cpp"
diff --git a/src/tools/testrunner/amtest.cpp b/src/tools/testrunner/amtest.cpp
index 3bbb0538..dfcafd58 100644
--- a/src/tools/testrunner/amtest.cpp
+++ b/src/tools/testrunner/amtest.cpp
@@ -157,3 +157,5 @@ int AmTest::findChildProcess(int ppid, const QString &substr)
 #endif  // Q_OS_LINIX
 
 QT_END_NAMESPACE_AM
+
+#include "moc_amtest.cpp"
diff --git a/src/tools/testrunner/testrunner.cpp b/src/tools/testrunner/testrunner.cpp
index b4b8f030..4f9d91d1 100644
--- a/src/tools/testrunner/testrunner.cpp
+++ b/src/tools/testrunner/testrunner.cpp
@@ -153,3 +153,5 @@ int TestRunner::exec()
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_testrunner_p.cpp"
diff --git a/src/window-lib/inprocesswindow.cpp b/src/window-lib/inprocesswindow.cpp
index aa9a4906..d093f6d7 100644
--- a/src/window-lib/inprocesswindow.cpp
+++ b/src/window-lib/inprocesswindow.cpp
@@ -112,7 +112,7 @@ void InProcessWindow::close()
     m_surfaceItem->close();
 }
 
-bool QtAM::InProcessWindow::isPopup() const
+bool InProcessWindow::isPopup() const
 {
     return false;
 }
@@ -123,3 +123,5 @@ QPoint InProcessWindow::requestedPopupPosition() const
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_inprocesswindow.cpp"
diff --git a/src/window-lib/touchemulation.cpp b/src/window-lib/touchemulation.cpp
index 985887f7..c58d4b53 100644
--- a/src/window-lib/touchemulation.cpp
+++ b/src/window-lib/touchemulation.cpp
@@ -84,3 +84,5 @@ bool TouchEmulation::isSupported()
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_touchemulation.cpp"
diff --git a/src/window-lib/waylandcompositor.cpp b/src/window-lib/waylandcompositor.cpp
index fde3eb5d..bc373dc4 100644
--- a/src/window-lib/waylandcompositor.cpp
+++ b/src/window-lib/waylandcompositor.cpp
@@ -260,3 +260,5 @@ void WaylandCompositor::onPopupCreated(QWaylandXdgPopup *popup, QWaylandXdgSurfa
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_waylandcompositor.cpp"
diff --git a/src/window-lib/waylandqtamserverextension.cpp b/src/window-lib/waylandqtamserverextension.cpp
index a383217a..f09e7110 100644
--- a/src/window-lib/waylandqtamserverextension.cpp
+++ b/src/window-lib/waylandqtamserverextension.cpp
@@ -107,3 +107,5 @@ void WaylandQtAMServerExtension::qtam_extension_set_window_property(QtWaylandSer
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_waylandqtamserverextension_p.cpp"
diff --git a/src/window-lib/waylandwindow.cpp b/src/window-lib/waylandwindow.cpp
index 13ca090d..4e577b33 100644
--- a/src/window-lib/waylandwindow.cpp
+++ b/src/window-lib/waylandwindow.cpp
@@ -229,3 +229,5 @@ void WaylandWindow::close()
 QT_END_NAMESPACE_AM
 
 #endif // AM_MULTI_PROCESS
+
+#include "moc_waylandwindow.cpp"
diff --git a/src/window-lib/window.cpp b/src/window-lib/window.cpp
index bcd58e38..654e5a77 100644
--- a/src/window-lib/window.cpp
+++ b/src/window-lib/window.cpp
@@ -225,3 +225,5 @@ bool Window::isBeingDisplayed() const
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_window.cpp"
diff --git a/src/window-lib/windowitem.cpp b/src/window-lib/windowitem.cpp
index 677360d3..c4ec5ff4 100644
--- a/src/window-lib/windowitem.cpp
+++ b/src/window-lib/windowitem.cpp
@@ -468,3 +468,5 @@ void WindowItem::WaylandImpl::setupSecondaryView()
 #endif // AM_MULTI_PROCESS
 
 QT_END_NAMESPACE_AM
+
+#include "moc_windowitem.cpp"
diff --git a/src/window-lib/windowmanager.cpp b/src/window-lib/windowmanager.cpp
index b6325780..72f8ee84 100644
--- a/src/window-lib/windowmanager.cpp
+++ b/src/window-lib/windowmanager.cpp
@@ -1052,3 +1052,5 @@ bool WindowManager::eventFilter(QObject *watched, QEvent *event)
 }
 
 QT_END_NAMESPACE_AM
+
+#include "moc_windowmanager.cpp"
diff --git a/tests/qml/crash/apps/tld.test.crash/terminator2/qmlterminator2.cpp b/tests/qml/crash/apps/tld.test.crash/terminator2/qmlterminator2.cpp
index 0ed12064..6ad8e346 100644
--- a/tests/qml/crash/apps/tld.test.crash/terminator2/qmlterminator2.cpp
+++ b/tests/qml/crash/apps/tld.test.crash/terminator2/qmlterminator2.cpp
@@ -109,3 +109,5 @@ void TerminatorThread::run()
 {
     m_terminator->accessIllegalMemory();
 }
+
+#include "moc_qmlterminator2.cpp"