Fix clazy warnings

nyalldawson · nyalldawson · commit 6ce88567413d · 2019-11-20T10:08:13.000+10:00
diff --git a/src/3d/qgs3dmapscene.cpp b/src/3d/qgs3dmapscene.cpp
@@ -495,7 +495,7 @@ void Qgs3DMapScene::updateCameraLens()
 void Qgs3DMapScene::onRenderersChanged()
 {
   // remove entities (if any)
-  qDeleteAll( mRenderersEntities.values() );
+  qDeleteAll( mRenderersEntities );
   mRenderersEntities.clear();
 
   // re-add entities from new set of renderers
diff --git a/src/3d/symbols/qgsmesh3dsymbol_p.h b/src/3d/symbols/qgsmesh3dsymbol_p.h
@@ -41,6 +41,8 @@ class QgsMeshLayer;
 //! Entity that handles rendering of polygons
 class QgsMesh3DSymbolEntity : public Qt3DCore::QEntity
 {
+    Q_OBJECT
+
   public:
     QgsMesh3DSymbolEntity( const Qgs3DMapSettings &map, QgsMeshLayer *layer, const QgsMesh3DSymbol &symbol, Qt3DCore::QNode *parent = nullptr );
 
@@ -50,6 +52,8 @@ class QgsMesh3DSymbolEntity : public Qt3DCore::QEntity
 
 class QgsMesh3DSymbolEntityNode : public Qt3DCore::QEntity
 {
+    Q_OBJECT
+
   public:
     QgsMesh3DSymbolEntityNode( const Qgs3DMapSettings &map, QgsMeshLayer *layer, const QgsMesh3DSymbol &symbol, Qt3DCore::QNode *parent = nullptr );
 
diff --git a/src/3d/terrain/qgsdemterraintilegeometry_p.h b/src/3d/terrain/qgsdemterraintilegeometry_p.h
@@ -53,6 +53,8 @@ namespace QgsRayCastingUtils
  */
 class DemTerrainTileGeometry : public Qt3DRender::QGeometry
 {
+    Q_OBJECT
+
   public:
 
     /**
diff --git a/src/analysis/mesh/qgsmeshcontours.cpp b/src/analysis/mesh/qgsmeshcontours.cpp
@@ -357,7 +357,6 @@ void QgsMeshContours::populateCache( const QgsMeshDatasetIndex &index, QgsMeshRe
 {
   if ( mCachedIndex != index )
   {
-    QVector<QgsMeshVertex> vertices = mTriangularMesh->vertices();
     bool scalarDataOnVertices = mMeshLayer->dataProvider()->datasetGroupMetadata( index ).dataType() != QgsMeshDatasetGroupMetadata::DataOnFaces;
     int count =  scalarDataOnVertices ? mNativeMesh->vertices.count() : mNativeMesh->faces.count();
 
diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -588,7 +588,6 @@ int main( int argc, char *argv[] )
 
   // The user can specify a path which will override the default path of custom
   // user settings (~/.qgis) and it will be used for QgsSettings INI file
-  QString configpath;
   QString authdbdirectory;
 
   QString pythonfile;
@@ -604,7 +603,7 @@ int main( int argc, char *argv[] )
 #if defined(ANDROID)
   QgsDebugMsg( QStringLiteral( "Android: All params stripped" ) );// Param %1" ).arg( argv[0] ) );
   //put all QGIS settings in the same place
-  configpath = QgsApplication::qgisSettingsDirPath();
+  QString configpath = QgsApplication::qgisSettingsDirPath();
   QgsDebugMsg( QStringLiteral( "Android: configpath set to %1" ).arg( configpath ) );
 #endif
 
diff --git a/src/app/qgsidentifyresultsdialog.h b/src/app/qgsidentifyresultsdialog.h
@@ -264,7 +264,7 @@ class APP_EXPORT QgsIdentifyResultsDialog: public QDialog, private Ui::QgsIdenti
     };
 
     QMenu *mActionPopup = nullptr;
-    QMap<QTreeWidgetItem *, QgsHighlight * > mHighlights;
+    QHash<QTreeWidgetItem *, QgsHighlight * > mHighlights;
     QgsMapCanvas *mCanvas = nullptr;
     QList<QgsFeature> mFeatures;
     QMap< QString, QMap< QString, QVariant > > mWidgetCaches;
diff --git a/src/app/qgsmaptoolreshape.cpp b/src/app/qgsmaptoolreshape.cpp
@@ -123,7 +123,6 @@ void QgsMapToolReshape::reshape( QgsVectorLayer *vlayer )
 
 
   QgsPointSequence pts;
-  QVector<QgsPoint> points;
   captureCurve()->points( pts );
   QgsLineString reshapeLineString( pts );
 
diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -498,7 +498,6 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
       cb->setChecked( activeChecks.contains( factory->id() ) );
       mGeometryCheckFactoriesGroupBoxes.insert( cb, factory->id() );
       topologyCheckLayout->addWidget( cb );
-      QString id = factory->id();
       if ( factory->id() == QStringLiteral( "QgsGeometryGapCheck" ) )
       {
         const QVariantMap gapCheckConfig = mLayer->geometryOptions()->checkConfiguration( QStringLiteral( "QgsGeometryGapCheck" ) );
diff --git a/src/app/qgswmsdimensiondialog.cpp b/src/app/qgswmsdimensiondialog.cpp
@@ -52,7 +52,7 @@ QgsWmsDimensionDialog::QgsWmsDimensionDialog( QgsVectorLayer *layer, QStringList
     QString name( pnMetaEnum.key( i ) );
     if ( !alreadyDefinedDimensions.contains( name.toLower() ) )
     {
-      mNameComboBox->addItem( QStringLiteral( "%1%2" ).arg( name.left( 1 ), name.mid( 1 ).toLower() ), QVariant( pnMetaEnum.value( i ) ) );
+      mNameComboBox->addItem( QStringLiteral( "%1%2" ).arg( !name.isEmpty() ? name.at( 0 ) : QString(), name.mid( 1 ).toLower() ), QVariant( pnMetaEnum.value( i ) ) );
     }
   }
 
diff --git a/src/core/layout/qgslayoutitemhtml.cpp b/src/core/layout/qgslayoutitemhtml.cpp
@@ -177,8 +177,8 @@ void QgsLayoutItemHtml::loadHtml( const bool useCache, const QgsExpressionContex
   bool loaded = false;
 
   QEventLoop loop;
-  connect( mWebPage.get(), &QWebPage::loadFinished, &loop, [&loaded, &loop ] { loaded = true; loop.quit(); } );
-  connect( mFetcher, &QgsNetworkContentFetcher::finished, &loop, [&loaded, &loop ] { loaded = true; loop.quit(); } );
+  connect( mWebPage.get(), &QWebPage::loadFinished, &loop, [&loaded, &loop ] { loaded = true; loop.quit(); } ); // clazy:exclude=lambda-in-connect
+  connect( mFetcher, &QgsNetworkContentFetcher::finished, &loop, [&loaded, &loop ] { loaded = true; loop.quit(); } ); // clazy:exclude=lambda-in-connect
 
   //reset page size. otherwise viewport size increases but never decreases again
   mWebPage->setViewportSize( QSize( maxFrameWidth() * mHtmlUnitsToLayoutUnits, 0 ) );
@@ -283,7 +283,7 @@ QString QgsLayoutItemHtml::fetchHtml( const QUrl &url )
   //pause until HTML fetch
   bool loaded = false;
   QEventLoop loop;
-  connect( mFetcher, &QgsNetworkContentFetcher::finished, &loop, [&loaded, &loop ] { loaded = true; loop.quit(); } );
+  connect( mFetcher, &QgsNetworkContentFetcher::finished, &loop, [&loaded, &loop ] { loaded = true; loop.quit(); } ); // clazy:exclude=lambda-in-connect
   mFetcher->fetchContent( url );
 
   if ( !loaded )
diff --git a/src/core/mesh/qgsmeshlayerrenderer.h b/src/core/mesh/qgsmeshlayerrenderer.h
@@ -44,6 +44,7 @@ class QgsRenderContext;
  */
 class QgsMeshLayerRendererFeedback : public QgsRasterBlockFeedback
 {
+    Q_OBJECT
 };
 
 
diff --git a/src/core/qgstextrenderer.cpp b/src/core/qgstextrenderer.cpp
@@ -2005,7 +2005,7 @@ void QgsTextFormat::readFromLayer( QgsVectorLayer *layer )
   d->blendMode = QgsPainting::getCompositionMode(
                    static_cast< QgsPainting::BlendMode >( layer->customProperty( QStringLiteral( "labeling/blendMode" ), QVariant( QgsPainting::BlendNormal ) ).toUInt() ) );
   d->multilineHeight = layer->customProperty( QStringLiteral( "labeling/multilineHeight" ), QVariant( 1.0 ) ).toDouble();
-  d->previewBackgroundColor = _readColor( layer, QStringLiteral( "labeling/previewBkgrdColor" ), "#ffffff", false );
+  d->previewBackgroundColor = _readColor( layer, QStringLiteral( "labeling/previewBkgrdColor" ), QColor( 255, 255, 255 ), false );
 
   mBufferSettings.readFromLayer( layer );
   mShadowSettings.readFromLayer( layer );
diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
@@ -1789,7 +1789,6 @@ bool QgsRasterLayer::readXml( const QDomNode &layer_node, QgsReadWriteContext &c
       }
 
       // Collect format
-      QDomNode formatNode = rpNode.namedItem( QStringLiteral( "wmsFormat" ) );
       uri.setParam( QStringLiteral( "format" ), rpNode.namedItem( QStringLiteral( "wmsFormat" ) ).toElement().text() );
 
       // WMS CRS URL param should not be mixed with that assigned to the layer.
diff --git a/src/gui/attributetable/qgsattributetabledelegate.cpp b/src/gui/attributetable/qgsattributetabledelegate.cpp
@@ -107,7 +107,6 @@ void QgsAttributeTableDelegate::setModelData( QWidget *editor, QAbstractItemMode
   QgsFeatureId fid = model->data( index, QgsAttributeTableModel::FeatureIdRole ).toLongLong();
   QVariant oldValue = model->data( index, Qt::EditRole );
 
-  QVariant newValue;
   QgsEditorWidgetWrapper *eww = QgsEditorWidgetWrapper::fromWidget( editor );
   if ( !eww )
     return;
diff --git a/src/gui/layertree/qgslayertreeviewdefaultactions.cpp b/src/gui/layertree/qgslayertreeviewdefaultactions.cpp
@@ -424,7 +424,7 @@ void QgsLayerTreeViewDefaultActions::moveOutOfGroup()
 
 void QgsLayerTreeViewDefaultActions::moveToTop()
 {
-  QMap <QgsLayerTreeGroup *, int> groupInsertIdx;
+  QHash <QgsLayerTreeGroup *, int> groupInsertIdx;
   int insertIdx;
   const QList< QgsLayerTreeNode * >  selectedNodes = mView->selectedNodes();
   for ( QgsLayerTreeNode *n : selectedNodes )
diff --git a/src/gui/providers/ogr/qgsgeopackageitemguiprovider.cpp b/src/gui/providers/ogr/qgsgeopackageitemguiprovider.cpp
@@ -215,7 +215,6 @@ bool QgsGeoPackageItemGuiProvider::rename( QgsDataItem *item, const QString &new
     }
     else
     {
-      QString filePath = parts.value( QStringLiteral( "path" ) ).toString();
       const QList<QgsMapLayer *> layersList( layerItem->layersInProject() );
       if ( ! layersList.isEmpty( ) )
       {
diff --git a/src/gui/qgsnewvectorlayerdialog.cpp b/src/gui/qgsnewvectorlayerdialog.cpp
@@ -295,7 +295,6 @@ QString QgsNewVectorLayerDialog::execAndCreateLayer( QString &errorMessage, QWid
   settings.setValue( QStringLiteral( "UI/encoding" ), enc );
 
   //try to create the new layer with OGRProvider instead of QgsVectorFileWriter
-  QString createError;
   if ( geometrytype != QgsWkbTypes::Unknown )
   {
     QgsCoordinateReferenceSystem srs = geomDialog.crs();
diff --git a/src/gui/qgsoptionsdialogbase.cpp b/src/gui/qgsoptionsdialogbase.cpp
@@ -285,7 +285,7 @@ void QgsOptionsDialogBase::registerTextSearchWidgets()
     {
 
       // get custom highlight widget in user added pages
-      QMap<QWidget *, QgsOptionsDialogHighlightWidget *> customHighlightWidgets;
+      QHash<QWidget *, QgsOptionsDialogHighlightWidget *> customHighlightWidgets;
       QgsOptionsPageWidget *opw = qobject_cast<QgsOptionsPageWidget *>( mOptStackedWidget->widget( i ) );
       if ( opw )
       {
diff --git a/src/gui/qgsoptionsdialoghighlightwidgetsimpl.cpp b/src/gui/qgsoptionsdialoghighlightwidgetsimpl.cpp
@@ -237,8 +237,6 @@ bool QgsOptionsDialogHighlightTree::highlightText( const QString &text )
     QList<QTreeWidgetItem *> items = treeWidget->findItems( text, Qt::MatchContains | Qt::MatchRecursive, 0 );
     success = !items.empty();
     mTreeInitialExpand.clear();
-    QBrush highlightBackground( QColor( HIGHLIGHT_BACKGROUND_RED, HIGHLIGHT_BACKGROUND_GREEN, HIGHLIGHT_BACKGROUND_BLUE ) );
-    QBrush highlightText( QColor( HIGHLIGHT_TEXT_RED, HIGHLIGHT_TEXT_GREEN, HIGHLIGHT_TEXT_BLUE ) );
     for ( QTreeWidgetItem *item : items )
     {
       setChildrenVisible( item, true );
diff --git a/src/gui/qgsrelationeditorwidget.cpp b/src/gui/qgsrelationeditorwidget.cpp
@@ -44,6 +44,8 @@
  */
 class QgsFilteredSelectionManager : public QgsVectorLayerSelectionManager
 {
+    Q_OBJECT
+
   public:
     QgsFilteredSelectionManager( QgsVectorLayer *layer, const QgsFeatureRequest &request, QObject *parent = nullptr )
       : QgsVectorLayerSelectionManager( layer, parent )
diff --git a/src/gui/qgssymbolbutton.cpp b/src/gui/qgssymbolbutton.cpp
@@ -642,8 +642,6 @@ void QgsSymbolButton::showColorDialog()
     return;
   }
 
-  QColor newColor;
-
   QgsColorDialog dialog( this, nullptr, mSymbol->color() );
   dialog.setTitle( tr( "Symbol Color" ) );
   dialog.setAllowOpacity( true );
diff --git a/src/providers/mssql/qgsmssqlsourceselect.cpp b/src/providers/mssql/qgsmssqlsourceselect.cpp
@@ -514,8 +514,6 @@ void QgsMssqlSourceSelect::btnConnect_clicked()
     return;
   }
 
-  QString connectionName = db.connectionName();
-
   // Test for geometry columns table first.  Don't use it if not found.
   QSqlQuery q = QSqlQuery( db );
   q.setForwardOnly( true );
diff --git a/src/providers/spatialite/qgsspatialiteprovider.cpp b/src/providers/spatialite/qgsspatialiteprovider.cpp
@@ -4391,7 +4391,6 @@ bool QgsSpatiaLiteProvider::changeAttributeValues( const QgsChangedAttributesMap
           first = false;
 
         QVariant::Type type = fld.type();
-        const auto typeName { fld.typeName() };
 
         if ( val.isNull() || !val.isValid() )
         {
diff --git a/src/providers/spatialite/qgsspatialiteproviderconnection.cpp b/src/providers/spatialite/qgsspatialiteproviderconnection.cpp
@@ -206,7 +206,6 @@ QList<QgsSpatiaLiteProviderConnection::TableProperty> QgsSpatiaLiteProviderConne
   }
   QList<QgsSpatiaLiteProviderConnection::TableProperty> tableInfo;
   QString errCause;
-  QList<QVariantList> results;
   try
   {
     QgsSpatiaLiteConnection connection( pathFromUri() );
diff --git a/src/providers/spatialite/qgsspatialitesourceselect.cpp b/src/providers/spatialite/qgsspatialitesourceselect.cpp
@@ -283,7 +283,6 @@ bool QgsSpatiaLiteSourceSelect::newConnection( QWidget *parent )
 
   QFileInfo myFI( myFile );
   QString myPath = myFI.path();
-  QString myName = myFI.fileName();
   QString savedName = myFI.fileName();
   QString baseKey = QStringLiteral( "/SpatiaLite/connections/" );
 
diff --git a/src/server/qgsserverapiutils.cpp b/src/server/qgsserverapiutils.cpp
@@ -157,7 +157,6 @@ QgsExpression QgsServerApiUtils::temporalFilterExpression( const QgsVectorLayer
       return QVariant::Type::Invalid;
     }
     const QgsField field { layer->fields().at( fieldIdx ) };
-    QString fieldRefValue;
     return field.type();
   };
 
@@ -171,7 +170,6 @@ QgsExpression QgsServerApiUtils::temporalFilterExpression( const QgsVectorLayer
       return QString();
     }
 
-    QString fieldRefValue;
     // Downcast only datetime -> date
     // always cast strings
     if ( fieldRealType == QVariant::Type::String )
diff --git a/src/server/qgsserverogcapihandler.cpp b/src/server/qgsserverogcapihandler.cpp
@@ -40,7 +40,6 @@ using namespace inja;
 QVariantMap QgsServerOgcApiHandler::values( const QgsServerApiContext &context ) const
 {
   QVariantMap result ;
-  QVariantList positional;
   const auto constParameters { parameters( context ) };
   for ( const auto &p : constParameters )
   {
diff --git a/src/server/services/wfs3/qgswfs3handlers.cpp b/src/server/services/wfs3/qgswfs3handlers.cpp
@@ -1094,7 +1094,6 @@ void QgsWfs3CollectionsItemsHandler::handleRequest( const QgsServerApiContext &c
   checkLayerIsAccessible( mapLayer, context );
 
   const std::string title { mapLayer->title().isEmpty() ? mapLayer->name().toStdString() : mapLayer->title().toStdString() };
-  const QString shortName { mapLayer->shortName().isEmpty() ? mapLayer->name() : mapLayer->shortName() };
 
   // Get parameters
   QVariantMap params { values( context )};
diff --git a/src/server/services/wms/qgswmsgetcapabilities.cpp b/src/server/services/wms/qgswmsgetcapabilities.cpp
@@ -170,8 +170,6 @@ namespace QgsWms
     QDomDocument doc;
     QDomElement wmsCapabilitiesElement;
 
-    QgsServerRequest::Parameters parameters = request.parameters();
-
     // Get service URL
     QUrl href = serviceUrl( request, project );
 
diff --git a/src/server/services/wms/qgswmsgetschemaextension.cpp b/src/server/services/wms/qgswmsgetschemaextension.cpp
@@ -42,8 +42,6 @@ namespace QgsWms
     Q_UNUSED( version )
     Q_UNUSED( serverIface )
 
-    QgsServerRequest::Parameters parameters = request.parameters();
-
     QDomDocument xsdDoc;
 
     QDir resourcesDir = QFileInfo( QgsApplication::serverResourcesPath() ).absoluteDir();
diff --git a/src/server/services/wms/qgswmsrendercontext.cpp b/src/server/services/wms/qgswmsrendercontext.cpp
@@ -452,7 +452,6 @@ void QgsWmsRenderContext::searchLayersToRenderSld()
     if ( !names.isEmpty() )
     {
       QString lname = names.item( 0 ).toElement().text();
-      QString err;
       if ( mNicknameLayers.contains( lname ) )
       {
         mSlds[lname] = namedElem;
diff --git a/tests/src/3d/testqgs3drendering.cpp b/tests/src/3d/testqgs3drendering.cpp
@@ -513,7 +513,7 @@ void TestQgs3DRendering::testAnimationExport()
                    nullptr );
 
   QVERIFY( success );
-  QVERIFY( QFileInfo( QDir( dir ).filePath( QStringLiteral( "test3danimation001.png" ) ) ).exists() );
+  QVERIFY( QFileInfo::exists( ( QDir( dir ).filePath( QStringLiteral( "test3danimation001.png" ) ) ) ) );
 }
 
 void TestQgs3DRendering::testBillboardRendering()
diff --git a/tests/src/analysis/testqgsprocessing.cpp b/tests/src/analysis/testqgsprocessing.cpp
@@ -323,7 +323,7 @@ class DummyAlgorithm : public QgsProcessingAlgorithm
 };
 
 //dummy provider for testing
-class DummyProvider : public QgsProcessingProvider
+class DummyProvider : public QgsProcessingProvider // clazy:exclude=missing-qobject-macro
 {
   public:
 
@@ -379,7 +379,7 @@ class DummyProvider : public QgsProcessingProvider
     friend class TestQgsProcessing;
 };
 
-class DummyProviderNoLoad : public DummyProvider
+class DummyProviderNoLoad : public DummyProvider // clazy:exclude=missing-qobject-macro
 {
   public:
 
@@ -420,7 +420,7 @@ class DummyAlgorithm2 : public QgsProcessingAlgorithm
 };
 
 
-class DummyProvider3 : public QgsProcessingProvider
+class DummyProvider3 : public QgsProcessingProvider // clazy:exclude=missing-qobject-macro
 {
   public:
 
@@ -450,7 +450,7 @@ class DummyProvider3 : public QgsProcessingProvider
 
 };
 
-class DummyProvider4 : public QgsProcessingProvider
+class DummyProvider4 : public QgsProcessingProvider // clazy:exclude=missing-qobject-macro
 {
   public:
 
diff --git a/tests/src/app/testqgsmaptoolmovefeature.cpp b/tests/src/app/testqgsmaptoolmovefeature.cpp
@@ -132,8 +132,6 @@ void TestQgsMapToolMoveFeature::testMoveFeature()
 {
   TestQgsMapToolAdvancedDigitizingUtils utils( mCaptureTool );
 
-  QSet<QgsFeatureId> oldFids = utils.existingFeatureIds();
-
   utils.mouseClick( 1, 1, Qt::LeftButton, Qt::KeyboardModifiers(), true );
   utils.mouseClick( 2, 1, Qt::LeftButton, Qt::KeyboardModifiers(), true );
 
@@ -152,8 +150,6 @@ void TestQgsMapToolMoveFeature::testTopologicalMoveFeature()
 
   TestQgsMapToolAdvancedDigitizingUtils utils( mCaptureTool );
 
-  QSet<QgsFeatureId> oldFids = utils.existingFeatureIds();
-
   utils.mouseClick( 1, 1, Qt::LeftButton, Qt::KeyboardModifiers(), true );
   utils.mouseClick( 2, 1, Qt::LeftButton, Qt::KeyboardModifiers(), true );
 
diff --git a/tests/src/app/testqgsmaptoolreshape.cpp b/tests/src/app/testqgsmaptoolreshape.cpp
@@ -193,8 +193,6 @@ void TestQgsMapToolReshape::testReshapeZ()
   // test with default Z value = 333
   QgsSettings().setValue( QStringLiteral( "/qgis/digitizing/default_z_value" ), 333 );
 
-  QSet<QgsFeatureId> oldFids = utils.existingFeatureIds();
-
   // snap on a linestringz layer
   utils.mouseClick( 1, 2, Qt::LeftButton, Qt::KeyboardModifiers(), true );
   utils.mouseClick( 2, 1, Qt::LeftButton, Qt::KeyboardModifiers(), true );
@@ -237,8 +235,6 @@ void TestQgsMapToolReshape::testTopologicalEditing()
   // test with default Z value = 333
   QgsSettings().setValue( QStringLiteral( "/qgis/digitizing/default_z_value" ), 333 );
 
-  QSet<QgsFeatureId> oldFids = utils.existingFeatureIds();
-
   utils.mouseClick( 4, 4, Qt::LeftButton, Qt::KeyboardModifiers(), true );
   utils.mouseClick( 7, 2, Qt::LeftButton, Qt::KeyboardModifiers(), true );
   utils.mouseClick( 4, 0, Qt::LeftButton, Qt::KeyboardModifiers(), true );
diff --git a/tests/src/core/testqgs25drenderer.cpp b/tests/src/core/testqgs25drenderer.cpp
@@ -118,7 +118,7 @@ void TestQgs25DRenderer::render()
   Qgs25DRenderer *renderer = new Qgs25DRenderer();
   renderer->setShadowEnabled( false );
   renderer->setWallShadingEnabled( false );
-  renderer->setRoofColor( QColor( "#fdbf6f" ) );
+  renderer->setRoofColor( QColor( 253, 191, 111 ) );
   mpPolysLayer->setRenderer( renderer );
 
   QVERIFY( imageCheck( "25d_render" ) );
diff --git a/tests/src/core/testqgsjsonutils.cpp b/tests/src/core/testqgsjsonutils.cpp
diff --git a/tests/src/core/testqgslayoutgeopdfexport.cpp b/tests/src/core/testqgslayoutgeopdfexport.cpp
diff --git a/tests/src/core/testqgsrasterlayer.cpp b/tests/src/core/testqgsrasterlayer.cpp
diff --git a/tests/src/core/testqgsstyle.cpp b/tests/src/core/testqgsstyle.cpp
diff --git a/tests/src/gui/testprocessinggui.cpp b/tests/src/gui/testprocessinggui.cpp
diff --git a/tests/src/gui/testqgslayoutview.cpp b/tests/src/gui/testqgslayoutview.cpp
diff --git a/tests/src/gui/testqgsmapcanvas.cpp b/tests/src/gui/testqgsmapcanvas.cpp
diff --git a/tests/src/gui/testqgsprocessingmodel.cpp b/tests/src/gui/testqgsprocessingmodel.cpp
diff --git a/tests/src/gui/testqgsrangewidgetwrapper.cpp b/tests/src/gui/testqgsrangewidgetwrapper.cpp
diff --git a/tests/src/gui/testqgsrelationreferencewidget.cpp b/tests/src/gui/testqgsrelationreferencewidget.cpp

Original file line number	Diff line number	Diff line change
`@@ -495,7 +495,7 @@ void Qgs3DMapScene::updateCameraLens()`
`495`	`495`	`void Qgs3DMapScene::onRenderersChanged()`
`496`	`496`	`{`
`497`	`497`	`// remove entities (if any)`
`498`		`- qDeleteAll( mRenderersEntities.values() );`
	`498`	`+ qDeleteAll( mRenderersEntities );`
`499`	`499`	`mRenderersEntities.clear();`
`500`	`500`
`501`	`501`	`// re-add entities from new set of renderers`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,8 @@ class QgsMeshLayer;`
`41`	`41`	`//! Entity that handles rendering of polygons`
`42`	`42`	`class QgsMesh3DSymbolEntity : public Qt3DCore::QEntity`
`43`	`43`	`{`
	`44`	`+ Q_OBJECT`
	`45`	`+`
`44`	`46`	`public:`
`45`	`47`	`QgsMesh3DSymbolEntity( const Qgs3DMapSettings &map, QgsMeshLayer layer, const QgsMesh3DSymbol &symbol, Qt3DCore::QNode parent = nullptr );`
`46`	`48`
`@@ -50,6 +52,8 @@ class QgsMesh3DSymbolEntity : public Qt3DCore::QEntity`
`50`	`52`
`51`	`53`	`class QgsMesh3DSymbolEntityNode : public Qt3DCore::QEntity`
`52`	`54`	`{`
	`55`	`+ Q_OBJECT`
	`56`	`+`
`53`	`57`	`public:`
`54`	`58`	`QgsMesh3DSymbolEntityNode( const Qgs3DMapSettings &map, QgsMeshLayer layer, const QgsMesh3DSymbol &symbol, Qt3DCore::QNode parent = nullptr );`
`55`	`59`