Merge pull request #59230 from m-kuhn/mocdefs

Add includemocs.py and create one moc file per cpp file

.clang-tidy

@@ -1 +1 @@
-Checks: 'bugprone-*,-bugprone-easily-swappable-parameters,-bugprone-virtual-near-miss'
+Checks: 'bugprone-*,-bugprone-easily-swappable-parameters,-bugprone-virtual-near-miss,-bugprone-suspicious-include'

.github/workflows/code_layout.yml

@@ -222,3 +222,15 @@ jobs:
 
       - name: Run cppcheck test
         run: ./scripts/cppcheck.sh
+
+  moc_check:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
+      - name: Run Check
+        run: python3 scripts/includemocs.py src --dry-run

python/PyQt6/gui/auto_generated/callouts/qgscalloutwidget.sip.in

@@ -7,7 +7,6 @@
  ************************************************************************/
 
 
-
 class QgsCalloutWidget : QWidget, protected QgsExpressionContextGenerator
 {
 %Docstring(signature="appended")

python/PyQt6/gui/auto_generated/qgsdial.sip.in

@@ -9,6 +9,7 @@
 
 
 
+
 class QgsDial : QDial
 {
 
@@ -38,6 +39,7 @@ Constructor for QgsDial
 
 
 };
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

python/PyQt6/gui/auto_generated/qgsslider.sip.in

@@ -9,6 +9,7 @@
 
 
 
+
 class QgsSlider : QSlider
 {
 
@@ -41,6 +42,7 @@ Constructor for QgsSlider
 
 
 };
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

python/gui/auto_generated/callouts/qgscalloutwidget.sip.in

@@ -7,7 +7,6 @@
  ************************************************************************/
 
 
-
 class QgsCalloutWidget : QWidget, protected QgsExpressionContextGenerator
 {
 %Docstring(signature="appended")

python/gui/auto_generated/qgsdial.sip.in

@@ -9,6 +9,7 @@
 
 
 
+
 class QgsDial : QDial
 {
 
@@ -38,6 +39,7 @@ Constructor for QgsDial
 
 
 };
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

python/gui/auto_generated/qgsslider.sip.in

@@ -9,6 +9,7 @@
 
 
 
+
 class QgsSlider : QSlider
 {
 
@@ -41,6 +42,7 @@ Constructor for QgsSlider
 
 
 };
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

scripts/includemocs.py

@@ -0,0 +1,259 @@
+#!/usr/bin/env python3
+
+#
+# This file is part of KDToolBox.
+#
+# SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
+# Author: Jesper K. Pedersen <jesper.pedersen@kdab.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+"""
+Script to add inclusion of mocs to files recursively.
+"""
+
+# pylint: disable=redefined-outer-name
+
+import os
+import re
+import argparse
+import sys
+
+dirty = False
+
+
+def stripInitialSlash(path):
+    if path and path.startswith("/"):
+        path = path[1:]
+    return path
+
+
+# Returns true if the path is to be excluded from the search
+
+
+def shouldExclude(root, path):
+    # pylint: disable=used-before-assignment,possibly-used-before-assignment
+    if not args.excludes:
+        return False  # No excludes provided
+
+    assert root.startswith(args.root)
+    root = stripInitialSlash(root[len(args.root):])
+
+    if args.headerPrefix:
+        assert root.startswith(args.headerPrefix)
+        root = stripInitialSlash(root[len(args.headerPrefix):])
+
+    return (path in args.excludes) or (root + "/" + path in args.excludes)
+
+
+regexp = re.compile("\\s*(Q_OBJECT|Q_GADGET|Q_NAMESPACE)\\s*")
+# Returns true if the header file provides contains a Q_OBJECT, Q_GADGET or Q_NAMESPACE macro
+
+
+def hasMacro(fileName):
+    with open(fileName, "r", encoding="ISO-8859-1") as fileHandle:
+        for line in fileHandle:
+            if regexp.match(line):
+                return True
+        return False
+
+
+# returns the matching .cpp file for the given .h file
+
+
+def matchingCPPFile(root, fileName):
+    assert root.startswith(args.root)
+    root = stripInitialSlash(root[len(args.root):])
+
+    if args.headerPrefix:
+        assert root.startswith(args.headerPrefix)
+        root = stripInitialSlash(root[len(args.headerPrefix):])
+
+    if args.sourcePrefix:
+        root = args.sourcePrefix + "/" + root
+
+    return (
+        args.root
+        + "/"
+        + root
+        + ("/" if root != "" else "")
+        + fileNameWithoutExtension(fileName)
+        + ".cpp"
+    )
+
+
+def fileNameWithoutExtension(fileName):
+    return os.path.splitext(os.path.basename(fileName))[0]
+
+
+# returns true if the specifies .cpp file already has the proper include
+
+
+def cppHasMOCInclude(fileName):
+    includeStatement = '#include "moc_%s.cpp"' % fileNameWithoutExtension(fileName)
+    with open(fileName, encoding="utf8") as fileHandle:
+        return includeStatement in fileHandle.read()
+
+
+def getMocInsertionLocation(filename, content):
+    headerIncludeRegex = re.compile(
+        r'#include "%s\.h".*\n' % fileNameWithoutExtension(filename), re.M
+    )
+    match = headerIncludeRegex.search(content)
+    if match:
+        return match.end()
+    return 0
+
+
+def trimExistingMocInclude(content, cppFileName):
+    mocStrRegex = re.compile(
+        r'#include "moc_%s\.cpp"\n' % fileNameWithoutExtension(cppFileName)
+    )
+    match = mocStrRegex.search(content)
+    if match:
+        return content[: match.start()] + content[match.end():]
+    return content
+
+
+def processFile(root, fileName):
+    # pylint: disable=global-statement
+    global dirty
+    macroFound = hasMacro(root + "/" + fileName)
+    logVerbose(
+        "Inspecting %s %s"
+        % (
+            root + "/" + fileName,
+            "[Has Q_OBJECT / Q_GADGET / Q_NAMESPACE]" if macroFound else "",
+        )
+    )
+
+    if macroFound:
+        cppFileName = matchingCPPFile(root, fileName)
+        logVerbose("  -> %s" % cppFileName)
+
+        if not os.path.exists(cppFileName):
+            log("file %s didn't exist (which might not be an error)" % cppFileName)
+            return
+
+        if args.replaceExisting or not cppHasMOCInclude(cppFileName):
+            dirty = True
+            if args.dryRun:
+                log("Missing moc include file: %s" % cppFileName)
+            else:
+                log("Updating %s" % cppFileName)
+
+                with open(cppFileName, "r", encoding="utf8") as f:
+                    content = f.read()
+
+                if args.replaceExisting:
+                    content = trimExistingMocInclude(content, cppFileName)
+
+                loc = getMocInsertionLocation(cppFileName, content)
+                if args.insertAtEnd:
+                    with open(cppFileName, "a", encoding="utf8") as f:
+                        f.write(
+                            '\n#include "moc_%s.cpp"\n'
+                            % fileNameWithoutExtension(cppFileName)
+                        )
+                else:
+                    with open(cppFileName, "w", encoding="utf8") as f:
+                        f.write(
+                            content[:loc]
+                            + (
+                                '#include "moc_%s.cpp"\n'
+                                % fileNameWithoutExtension(cppFileName)
+                            )
+                            + content[loc:]
+                        )
+
+
+def log(content):
+    if not args.quiet:
+        print(content)
+
+
+def logVerbose(content):
+    if args.verbose:
+        print(content)
+
+
+# MAIN
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(
+        description="""Script to add inclusion of mocs to files recursively.
+        The source files either need to be in the same directories as the header files or in parallel directories,
+        where the root of the headers are specified using --header-prefix and the root of the sources are specified using --source-prefix.
+        If either header-prefix or source-prefix is the current directory, then they may be omitted."""
+    )
+    parser.add_argument(
+        "--dry-run",
+        "-n",
+        dest="dryRun",
+        action="store_true",
+        help="only report files to be updated",
+    )
+    parser.add_argument(
+        "--quiet", "-q", dest="quiet", action="store_true", help="suppress output"
+    )
+    parser.add_argument("--verbose", "-v", dest="verbose", action="store_true")
+    parser.add_argument(
+        "--header-prefix",
+        metavar="directory",
+        dest="headerPrefix",
+        help="This directory will be replaced with source-prefix when "
+        "searching for matching source files",
+    )
+    parser.add_argument(
+        "--source-prefix",
+        metavar="directory",
+        dest="sourcePrefix",
+        help="see --header-prefix",
+    )
+    parser.add_argument(
+        "--excludes",
+        metavar="directory",
+        dest="excludes",
+        nargs="*",
+        help="directories to be excluded, might either be in the form of a directory name, "
+        "e.g. 3rdparty or a partial directory prefix from the root, e.g 3rdparty/parser",
+    )
+    parser.add_argument(
+        "--insert-at-end",
+        dest="insertAtEnd",
+        action="store_true",
+        help="insert the moc include at the end of the file instead of the beginning",
+    )
+    parser.add_argument(
+        "--replace-existing",
+        dest="replaceExisting",
+        action="store_true",
+        help="delete and readd existing MOC include statements",
+    )
+    parser.add_argument(
+        dest="root",
+        default=".",
+        metavar="directory",
+        nargs="?",
+        help="root directory for the operation",
+    )
+
+    args = parser.parse_args()
+
+    root = args.root
+    if args.headerPrefix:
+        root += "/" + args.headerPrefix
+
+    path = os.walk(root)
+    for root, directories, files in path:
+        # Filter out directories specified in --exclude
+        directories[:] = [d for d in directories if not shouldExclude(root, d)]
+
+        for file in files:
+            if file.endswith(".h") or file.endswith(".hpp"):
+                processFile(root, file)
+
+    if not dirty:
+        log("No changes needed")
+
+    sys.exit(-1 if dirty else 0)

src/3d/chunks/qgschunkboundsentity_p.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgschunkboundsentity_p.h"
+#include "moc_qgschunkboundsentity_p.cpp"
 
 #include <Qt3DExtras/QPhongMaterial>
 

src/3d/chunks/qgschunkedentity.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgschunkedentity.h"
+#include "moc_qgschunkedentity.cpp"
 
 #include <QElapsedTimer>
 #include <QVector4D>

src/3d/chunks/qgschunkloader.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgschunkloader.h"
+#include "moc_qgschunkloader.cpp"
 #include "qgschunknode.h"
 
 #include <QVector>

src/3d/chunks/qgschunkqueuejob.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgschunkqueuejob.h"
+#include "moc_qgschunkqueuejob.cpp"
 
 ///@cond PRIVATE
 

src/3d/materials/qgsmaterial.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgsmaterial.h"
+#include "moc_qgsmaterial.cpp"
 #include "qgs3dutils.h"
 
 #include <Qt3DRender/QEffect>

src/3d/materials/qgsmetalroughmaterial.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgsmetalroughmaterial.h"
+#include "moc_qgsmetalroughmaterial.cpp"
 #include "qgs3dutils.h"
 #include <Qt3DRender/QParameter>
 #include <Qt3DRender/QRenderPass>

src/3d/materials/qgsphongtexturedmaterial.cpp

@@ -21,6 +21,7 @@
 #include <Qt3DRender/QTechnique>
 
 #include "qgsphongtexturedmaterial.h"
+#include "moc_qgsphongtexturedmaterial.cpp"
 
 ///@cond PRIVATE
 QgsPhongTexturedMaterial::QgsPhongTexturedMaterial( QNode *parent )

src/3d/materials/qgstexturematerial.cpp

@@ -24,6 +24,7 @@
 #include <Qt3DRender/QTexture>
 
 #include "qgstexturematerial.h"
+#include "moc_qgstexturematerial.cpp"
 
 ///@cond PRIVATE
 QgsTextureMaterial::QgsTextureMaterial( QNode *parent )

src/3d/mesh/qgsmesh3dentity_p.cpp

@@ -16,6 +16,7 @@
  ***************************************************************************/
 
 #include "qgsmesh3dentity_p.h"
+#include "moc_qgsmesh3dentity_p.cpp"
 
 #include <Qt3DRender/QGeometryRenderer>
 

src/3d/mesh/qgsmesh3dgeometry_p.cpp

@@ -16,6 +16,7 @@
  ***************************************************************************/
 
 #include "qgsmesh3dgeometry_p.h"
+#include "moc_qgsmesh3dgeometry_p.cpp"
 
 #include <QFutureWatcher>
 #include <QtConcurrentRun>

src/3d/mesh/qgsmesh3dmaterial_p.cpp

@@ -16,6 +16,7 @@
  ***************************************************************************/
 
 #include "qgsmesh3dmaterial_p.h"
+#include "moc_qgsmesh3dmaterial_p.cpp"
 
 #include <Qt3DRender/QEffect>
 #include <Qt3DRender/QGraphicsApiFilter>

src/3d/mesh/qgsmeshterraingenerator.cpp

@@ -16,6 +16,7 @@
  ***************************************************************************/
 
 #include "qgsmeshterraingenerator.h"
+#include "moc_qgsmeshterraingenerator.cpp"
 #include "qgsmeshterraintileloader_p.h"
 
 #include "qgsmesh3dentity_p.h"

src/3d/processing/qgs3dalgorithms.cpp

@@ -16,6 +16,7 @@
  ***************************************************************************/
 
 #include "qgs3dalgorithms.h"
+#include "moc_qgs3dalgorithms.cpp"
 #include "qgsalgorithmtessellate.h"
 #include "qgsapplication.h"
 

src/3d/qgs3daxis.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgs3daxis.h"
+#include "moc_qgs3daxis.cpp"
 
 #include <Qt3DCore/QTransform>
 #include <Qt3DExtras/QCylinderMesh>

src/3d/qgs3dmapcanvas.cpp

@@ -34,6 +34,7 @@
 #include "qgs3dmapsettings.h"
 #include "qgs3dmaptool.h"
 #include "qgstemporalcontroller.h"
+#include "moc_qgs3dmapcanvas.cpp"
 
 Qgs3DMapCanvas::Qgs3DMapCanvas()
   : m_aspectEngine( new Qt3DCore::QAspectEngine )

src/3d/qgs3dmapscene.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgs3dmapscene.h"
+#include "moc_qgs3dmapscene.cpp"
 
 #include <Qt3DRender/QCamera>
 #include <Qt3DRender/QMesh>

src/3d/qgs3dmapsettings.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgs3dmapsettings.h"
+#include "moc_qgs3dmapsettings.cpp"
 
 #include "qgs3dutils.h"
 #include "qgsflatterraingenerator.h"

src/3d/qgs3dmaptool.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgs3dmaptool.h"
+#include "moc_qgs3dmaptool.cpp"
 
 #include "qgs3dmapcanvas.h"
 

src/3d/qgs3dsceneexporter.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgs3dsceneexporter.h"
+#include "moc_qgs3dsceneexporter.cpp"
 
 #include <QVector>
 #include <Qt3DCore/QEntity>

src/3d/qgs3dwiredmesh_p.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgs3dwiredmesh_p.h"
+#include "moc_qgs3dwiredmesh_p.cpp"
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <Qt3DRender/QAttribute>

src/3d/qgsabstract3dengine.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgsabstract3dengine.h"
+#include "moc_qgsabstract3dengine.cpp"
 
 #include "qgsframegraph.h"
 

src/3d/qgsambientocclusionblurentity.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgsambientocclusionblurentity.h"
+#include "moc_qgsambientocclusionblurentity.cpp"
 
 #include <Qt3DRender/QParameter>
 

src/3d/qgsambientocclusionrenderentity.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgsambientocclusionrenderentity.h"
+#include "moc_qgsambientocclusionrenderentity.cpp"
 
 #include <random>
 

src/3d/qgscameracontroller.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgscameracontroller.h"
+#include "moc_qgscameracontroller.cpp"
 #include "qgsvector3d.h"
 #include "qgswindow3dengine.h"
 #include "qgs3dmapscene.h"

src/3d/qgscolorramptexture.cpp

@@ -16,6 +16,7 @@
  ***************************************************************************/
 
 #include "qgscolorramptexture.h"
+#include "moc_qgscolorramptexture.cpp"
 
 /// @cond PRIVATE
 

src/3d/qgsframegraph.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgsframegraph.h"
+#include "moc_qgsframegraph.cpp"
 #include "qgsdirectionallightsettings.h"
 #include "qgspostprocessingentity.h"
 #include "qgspreviewquad.h"

src/3d/qgsimagetexture.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgsimagetexture.h"
+#include "moc_qgsimagetexture.cpp"
 
 
 QgsImageTexture::QgsImageTexture( const QImage &image, Qt3DCore::QNode *parent )

src/3d/qgslayoutitem3dmap.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgslayoutitem3dmap.h"
+#include "moc_qgslayoutitem3dmap.cpp"
 
 #include "qgs3dmapscene.h"
 #include "qgs3dutils.h"

src/3d/qgsoffscreen3dengine.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgsoffscreen3dengine.h"
+#include "moc_qgsoffscreen3dengine.cpp"
 
 #include "qgsframegraph.h"
 

src/3d/qgspointcloudlayerchunkloader_p.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgspointcloudlayerchunkloader_p.h"
+#include "moc_qgspointcloudlayerchunkloader_p.cpp"
 
 #include "qgs3dutils.h"
 #include "qgspointcloudlayer3drenderer.h"

src/3d/qgspostprocessingentity.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgspostprocessingentity.h"
+#include "moc_qgspostprocessingentity.cpp"
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <Qt3DRender/QAttribute>
@@ -44,8 +45,8 @@ typedef Qt3DCore::QGeometry Qt3DQGeometry;
 
 QgsPostprocessingEntity::QgsPostprocessingEntity( QgsFrameGraph *frameGraph, Qt3DRender::QLayer *layer, QNode *parent )
   : QgsRenderPassQuad( layer, parent )
-  , mFrameGraph( frameGraph )
 {
+  Q_UNUSED( frameGraph )
   mColorTextureParameter = new Qt3DRender::QParameter( QStringLiteral( "colorTexture" ), frameGraph->forwardRenderColorTexture() );
   mDepthTextureParameter = new Qt3DRender::QParameter( QStringLiteral( "depthTexture" ), frameGraph->forwardRenderDepthTexture() );
   mShadowMapParameter = new Qt3DRender::QParameter( QStringLiteral( "shadowTexture" ), frameGraph->shadowMapTexture() );

src/3d/qgspostprocessingentity.h

@@ -59,7 +59,6 @@ class QgsPostprocessingEntity : public QgsRenderPassQuad
     void setAmbientOcclusionEnabled( bool enabled );
 
   private:
-    QgsFrameGraph *mFrameGraph = nullptr;
     Qt3DRender::QCamera *mMainCamera = nullptr;
 
     Qt3DRender::QParameter *mColorTextureParameter = nullptr;

src/3d/qgspreviewquad.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgspreviewquad.h"
+#include "moc_qgspreviewquad.cpp"
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <Qt3DRender/QGeometry>

src/3d/qgsrenderpassquad.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgsrenderpassquad.h"
+#include "moc_qgsrenderpassquad.cpp"
 
 #include <random>
 

src/3d/qgsrulebasedchunkloader_p.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgsrulebasedchunkloader_p.h"
+#include "moc_qgsrulebasedchunkloader_p.cpp"
 #include "qgsvectorlayerchunkloader_p.h"
 
 #include "qgs3dutils.h"

src/3d/qgsskyboxentity.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgsskyboxentity.h"
+#include "moc_qgsskyboxentity.cpp"
 
 #include <Qt3DCore/QEntity>
 #include <Qt3DExtras/QCuboidMesh>

src/3d/qgstessellatedpolygongeometry.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgstessellatedpolygongeometry.h"
+#include "moc_qgstessellatedpolygongeometry.cpp"
 #include "qgsraycastingutils_p.h"
 #include "qgsmessagelog.h"
 

src/3d/qgstiledscenechunkloader_p.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgstiledscenechunkloader_p.h"
+#include "moc_qgstiledscenechunkloader_p.cpp"
 
 #include "qgs3dmapsettings.h"
 #include "qgs3dutils.h"

src/3d/qgsvectorlayerchunkloader_p.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgsvectorlayerchunkloader_p.h"
+#include "moc_qgsvectorlayerchunkloader_p.cpp"
 #include "qgs3dutils.h"
 #include "qgsline3dsymbol.h"
 #include "qgspoint3dsymbol.h"

src/3d/qgsvirtualpointcloudentity_p.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgsvirtualpointcloudentity_p.h"
+#include "moc_qgsvirtualpointcloudentity_p.cpp"
 #include "qgsvirtualpointcloudprovider.h"
 #include "qgspointcloudlayerchunkloader_p.h"
 #include "qgschunkboundsentity_p.h"

src/3d/qgsvirtualpointcloudentity_p.h

@@ -97,7 +97,6 @@ class QgsVirtualPointCloudEntity : public Qgs3DMapSceneEntity
     QgsChunkBoundsEntity *mBboxesEntity = nullptr;
     QList<QgsAABB> mBboxes;
     QgsCoordinateTransform mCoordinateTransform;
-    QgsPointCloudIndex *mPointCloudIndex;
     std::unique_ptr< QgsPointCloud3DSymbol > mSymbol;
     double mZValueScale = 1.0;
     double mZValueOffset = 0;

src/3d/qgswindow3dengine.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgswindow3dengine.h"
+#include "moc_qgswindow3dengine.cpp"
 
 #include <Qt3DExtras/QForwardRenderer>
 #include <Qt3DRender/QRenderSettings>

src/3d/symbols/qgsbillboardgeometry.cpp

@@ -30,6 +30,7 @@ typedef Qt3DCore::QBuffer Qt3DQBuffer;
 #endif
 
 #include "qgsbillboardgeometry.h"
+#include "moc_qgsbillboardgeometry.cpp"
 
 QgsBillboardGeometry::QgsBillboardGeometry( Qt3DCore::QNode *parent )
   : QGeometry( parent )

src/3d/symbols/qgslinematerial_p.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgslinematerial_p.h"
+#include "moc_qgslinematerial_p.cpp"
 
 #include <QColor>
 #include <QSizeF>

src/3d/symbols/qgspoint3dbillboardmaterial.cpp

@@ -24,6 +24,7 @@
 #include <QUrl>
 
 #include "qgspoint3dbillboardmaterial.h"
+#include "moc_qgspoint3dbillboardmaterial.cpp"
 #include "qgsterraintextureimage_p.h"
 #include "qgssymbollayerutils.h"
 #include "qgsmarkersymbol.h"

src/3d/symbols/qgspointcloud3dsymbol_p.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgspointcloud3dsymbol_p.h"
+#include "moc_qgspointcloud3dsymbol_p.cpp"
 
 ///@cond PRIVATE
 

src/3d/terrain/qgsdemterraingenerator.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgsdemterraingenerator.h"
+#include "moc_qgsdemterraingenerator.cpp"
 
 #include "qgsdemterraintileloader_p.h"
 

src/3d/terrain/qgsdemterraintilegeometry_p.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgsdemterraintilegeometry_p.h"
+#include "moc_qgsdemterraintilegeometry_p.cpp"
 #include <QMatrix4x4>
 
 

src/3d/terrain/qgsdemterraintileloader_p.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgsdemterraintileloader_p.h"
+#include "moc_qgsdemterraintileloader_p.cpp"
 
 #include "qgs3dmapsettings.h"
 #include "qgschunknode.h"

src/3d/terrain/qgsflatterraingenerator.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgsflatterraingenerator.h"
+#include "moc_qgsflatterraingenerator.cpp"
 
 #include <Qt3DRender/QGeometryRenderer>
 #include <Qt3DCore/QTransform>

src/3d/terrain/qgsonlineterraingenerator.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgsonlineterraingenerator.h"
+#include "moc_qgsonlineterraingenerator.cpp"
 
 #include "qgsdemterraintileloader_p.h"
 

src/3d/terrain/qgsquantizedmeshterraingenerator.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgsquantizedmeshterraingenerator.h"
+#include "moc_qgsquantizedmeshterraingenerator.cpp"
 #include "qgschunkloader.h"
 #include "qgschunknode.h"
 #include "qgscoordinatetransform.h"

src/3d/terrain/qgsterrainentity.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgsterrainentity.h"
+#include "moc_qgsterrainentity.cpp"
 
 #include "qgsaabb.h"
 #include "qgs3dmapsettings.h"

src/3d/terrain/qgsterraingenerator.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgsterraingenerator.h"
+#include "moc_qgsterraingenerator.cpp"
 
 #include "qgs3dmapsettings.h"
 #include "qgs3dutils.h"

src/3d/terrain/qgsterraintexturegenerator_p.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgsterraintexturegenerator_p.h"
+#include "moc_qgsterraintexturegenerator_p.cpp"
 
 #include <qgsmaprenderercustompainterjob.h>
 #include <qgsmaprenderersequentialjob.h>

src/3d/terrain/qgsterraintextureimage_p.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgsterraintextureimage_p.h"
+#include "moc_qgsterraintextureimage_p.cpp"
 
 #include <Qt3DRender/QTextureImageDataGenerator>
 

src/3d/terrain/qgsterraintileloader.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgsterraintileloader.h"
+#include "moc_qgsterraintileloader.cpp"
 
 #include "qgs3dmapsettings.h"
 #include "qgs3dutils.h"

src/analysis/georeferencing/qgsgcptransformer.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgsgcptransformer.h"
+#include "moc_qgsgcptransformer.cpp"
 
 #include <gdal.h>
 #include <gdal_alg.h>

src/analysis/georeferencing/qgsvectorwarper.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgsvectorwarper.h"
+#include "moc_qgsvectorwarper.cpp"
 #include "qgsfeaturesink.h"
 #include "qgsfeedback.h"
 #include "qgsgcpgeometrytransformer.h"

src/analysis/mesh/qgsmeshtriangulation.cpp

@@ -16,6 +16,7 @@
  ***************************************************************************/
 
 #include "qgsmeshtriangulation.h"
+#include "moc_qgsmeshtriangulation.cpp"
 #include "qgsdualedgetriangulation.h"
 #include "qgscurve.h"
 #include "qgscurvepolygon.h"

src/analysis/network/qgsvectorlayerdirector.cpp

@@ -19,6 +19,7 @@
  */
 
 #include "qgsvectorlayerdirector.h"
+#include "moc_qgsvectorlayerdirector.cpp"
 #include "qgsgraphbuilderinterface.h"
 
 #include "qgsfeatureiterator.h"

src/analysis/processing/pdal/qgspdalalgorithms.cpp

@@ -16,6 +16,7 @@
  ***************************************************************************/
 
 #include "qgspdalalgorithms.h"
+#include "moc_qgspdalalgorithms.cpp"
 #include "qgsruntimeprofiler.h"
 #include "qgsapplication.h"
 

src/analysis/processing/qgsalgorithmfiledownloader.cpp

@@ -16,6 +16,7 @@
  ***************************************************************************/
 
 #include "qgsalgorithmfiledownloader.h"
+#include "moc_qgsalgorithmfiledownloader.cpp"
 #include "qgsprocessingparameters.h"
 #include "qgis.h"
 #include "qgsfiledownloader.h"

src/analysis/processing/qgsalgorithmhttprequest.cpp

@@ -16,6 +16,7 @@
  ***************************************************************************/
 
 #include "qgsalgorithmhttprequest.h"
+#include "moc_qgsalgorithmhttprequest.cpp"
 #include "qgsprocessingparameters.h"
 #include "qgis.h"
 

src/analysis/processing/qgsalgorithmurlopener.cpp

@@ -16,6 +16,7 @@
  ***************************************************************************/
 
 #include "qgsalgorithmurlopener.h"
+#include "moc_qgsalgorithmurlopener.cpp"
 #include "qgsprocessingparameters.h"
 #include "qgis.h"
 

src/analysis/processing/qgsnativealgorithms.cpp

@@ -16,6 +16,7 @@
  ***************************************************************************/
 
 #include "qgsnativealgorithms.h"
+#include "moc_qgsnativealgorithms.cpp"
 #include "qgsruntimeprofiler.h"
 #include "qgsalgorithmaddincrementalfield.h"
 #include "qgsalgorithmaddtablefield.h"

src/analysis/vector/geometry_checker/qgsgeometrycheck.cpp

@@ -17,6 +17,7 @@
 #include "qgsgeometrycollection.h"
 #include "qgscurvepolygon.h"
 #include "qgsgeometrycheck.h"
+#include "moc_qgsgeometrycheck.cpp"
 #include "qgsgeometrycheckerror.h"
 #include "qgsfeaturepool.h"
 #include "qgsvectorlayer.h"

src/analysis/vector/geometry_checker/qgsgeometrychecker.cpp

@@ -22,6 +22,7 @@
 
 #include "qgsgeometrycheckcontext.h"
 #include "qgsgeometrychecker.h"
+#include "moc_qgsgeometrychecker.cpp"
 #include "qgsgeometrycheck.h"
 #include "qgsfeaturepool.h"
 #include "qgsproject.h"

src/analysis/vector/geometry_checker/qgsgeometrygapcheck.cpp

@@ -16,6 +16,7 @@
 #include "qgsgeometrycheckcontext.h"
 #include "qgsgeometryengine.h"
 #include "qgsgeometrygapcheck.h"
+#include "moc_qgsgeometrygapcheck.cpp"
 #include "qgsfeaturepool.h"
 #include "qgsvectorlayer.h"
 #include "qgsvectorlayerutils.h"

src/analysis/vector/geometry_checker/qgsvectorlayerfeaturepool.cpp

@@ -14,6 +14,7 @@ email                : matthias@opengis.ch
  ***************************************************************************/
 
 #include "qgsvectorlayerfeaturepool.h"
+#include "moc_qgsvectorlayerfeaturepool.cpp"
 #include "qgsthreadingutils.h"
 
 #include "qgsfeaturerequest.h"

src/analysis/vector/qgsgeometrysnapper.cpp

@@ -18,6 +18,7 @@
 #include "qgsgeometry.h"
 #include "qgsvectorlayer.h"
 #include "qgsgeometrysnapper.h"
+#include "moc_qgsgeometrysnapper.cpp"
 #include "qgsvectordataprovider.h"
 #include "qgsgeometryutils.h"
 #include "qgssurface.h"

src/app/3d/qgs3danimationexportdialog.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgs3danimationexportdialog.h"
+#include "moc_qgs3danimationexportdialog.cpp"
 #include "qgsproject.h"
 #include "qgsgui.h"
 #include "qgssettings.h"

src/app/3d/qgs3danimationwidget.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgs3danimationwidget.h"
+#include "moc_qgs3danimationwidget.cpp"
 
 #include "qgs3danimationsettings.h"
 #include "qgsapplication.h"

src/app/3d/qgs3dicongenerator.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgs3dicongenerator.h"
+#include "moc_qgs3dicongenerator.cpp"
 #include "qgsapplication.h"
 #include <QDir>
 

src/app/3d/qgs3dmapcanvaswidget.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgs3dmapcanvaswidget.h"
+#include "moc_qgs3dmapcanvaswidget.cpp"
 
 #include <QBoxLayout>
 #include <QDialog>

src/app/3d/qgs3dmapcanvaswidget.h

@@ -127,7 +127,6 @@ class APP_EXPORT Qgs3DMapCanvasWidget : public QWidget
     QAction *mActionMapThemes = nullptr;
     QAction *mActionCamera = nullptr;
     QAction *mActionEffects = nullptr;
-    QAction *mActionOptions = nullptr;
     QAction *mActionSetSceneExtent = nullptr;
     QgsDockableWidgetHelper *mDockableWidgetHelper = nullptr;
     QObjectUniquePtr< QgsRubberBand > mViewFrustumHighlight;

src/app/3d/qgs3dmapconfigwidget.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgs3dmapconfigwidget.h"
+#include "moc_qgs3dmapconfigwidget.cpp"
 
 #include "qgs3dmapsettings.h"
 #include "qgsdemterraingenerator.h"
@@ -40,8 +41,8 @@ Qgs3DMapConfigWidget::Qgs3DMapConfigWidget( Qgs3DMapSettings *map, QgsMapCanvas
   : QWidget( parent )
   , mMap( map )
   , mMainCanvas( mainCanvas )
-  , m3DMapCanvas( mapCanvas3D )
 {
+  Q_UNUSED( mapCanvas3D )
   setupUi( this );
 
   Q_ASSERT( map );

src/app/3d/qgs3dmapconfigwidget.h

@@ -54,7 +54,6 @@ class Qgs3DMapConfigWidget : public QWidget, private Ui::Map3DConfigWidget
   private:
     Qgs3DMapSettings *mMap = nullptr;
     QgsMapCanvas *mMainCanvas = nullptr;
-    Qgs3DMapCanvas *m3DMapCanvas = nullptr;
     QgsMesh3DSymbolWidget *mMeshSymbolWidget = nullptr;
     QgsSkyboxRenderingSettingsWidget *mSkyboxSettingsWidget = nullptr;
     QgsShadowRenderingSettingsWidget *mShadowSettingsWidget = nullptr;

src/app/3d/qgs3dmaptoolidentify.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgs3dmaptoolidentify.h"
+#include "moc_qgs3dmaptoolidentify.cpp"
 
 #include <QScreen>
 

src/app/3d/qgs3dmaptoolmeasureline.cpp

@@ -16,6 +16,7 @@
 #include <QKeyEvent>
 
 #include "qgs3dmaptoolmeasureline.h"
+#include "moc_qgs3dmaptoolmeasureline.cpp"
 #include "qgs3dutils.h"
 #include "qgs3dmapscene.h"
 #include "qgs3dmapcanvas.h"

src/app/3d/qgs3dmeasuredialog.cpp

@@ -17,6 +17,7 @@
 #include <QPushButton>
 
 #include "qgs3dmeasuredialog.h"
+#include "moc_qgs3dmeasuredialog.cpp"
 #include "qgs3dmaptoolmeasureline.h"
 #include "qgisapp.h"
 #include "qgs3dmapcanvas.h"

src/app/3d/qgs3dmodelsourcelineedit.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgs3dmodelsourcelineedit.h"
+#include "moc_qgs3dmodelsourcelineedit.cpp"
 
 //
 // Qgs3DModelSourceLineEdit

src/app/3d/qgs3dnavigationwidget.cpp

@@ -28,6 +28,7 @@ Q_NOWARN_DEPRECATED_POP
 #include "qgscameracontroller.h"
 #include "qgs3dmapcanvas.h"
 #include "qgs3dnavigationwidget.h"
+#include "moc_qgs3dnavigationwidget.cpp"
 
 #include <Qt3DRender/QCamera>
 

src/app/3d/qgs3doptions.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgs3doptions.h"
+#include "moc_qgs3doptions.cpp"
 #include "qgsapplication.h"
 #include "qgssettings.h"
 #include "qgis.h"

src/app/3d/qgs3dviewsmanagerdialog.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgs3dviewsmanagerdialog.h"
+#include "moc_qgs3dviewsmanagerdialog.cpp"
 
 #include "qgisapp.h"
 #include "qgsnewnamedialog.h"

src/app/3d/qgsambientocclusionsettingswidget.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgsambientocclusionsettingswidget.h"
+#include "moc_qgsambientocclusionsettingswidget.cpp"
 
 QgsAmbientOcclusionSettingsWidget::QgsAmbientOcclusionSettingsWidget( QWidget *parent )
   : QWidget( parent )

src/app/3d/qgsgoochmaterialwidget.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgsgoochmaterialwidget.h"
+#include "moc_qgsgoochmaterialwidget.cpp"
 
 #include "qgsgoochmaterialsettings.h"
 #include "qgis.h"

src/app/3d/qgslightswidget.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgslightswidget.h"
+#include "moc_qgslightswidget.cpp"
 
 #include "qgs3dmapsettings.h"
 #include "qgsapplication.h"

src/app/3d/qgsline3dsymbolwidget.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgsline3dsymbolwidget.h"
+#include "moc_qgsline3dsymbolwidget.cpp"
 
 #include "qgsline3dsymbol.h"
 #include "qgsphongmaterialsettings.h"

src/app/3d/qgsmap3dexportwidget.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgsmap3dexportwidget.h"
+#include "moc_qgsmap3dexportwidget.cpp"
 #include "ui_map3dexportwidget.h"
 
 #include <QPushButton>

src/app/3d/qgsmaterialwidget.cpp

@@ -14,6 +14,7 @@
  ***************************************************************************/
 
 #include "qgsmaterialwidget.h"
+#include "moc_qgsmaterialwidget.cpp"
 #include "qgs3d.h"
 #include "qgsmaterialregistry.h"
 #include "qgsabstractmaterialsettings.h"