Fix compilation with QT 5.15

python/CMakeLists.txt

@@ -192,6 +192,11 @@ ENDIF((${SIP_VERSION_STR} VERSION_EQUAL 4.19.11) OR (${SIP_VERSION_STR} VERSION_
 IF((${SIP_VERSION_STR} VERSION_EQUAL 4.18) OR (${SIP_VERSION_STR} VERSION_GREATER 4.18))
   SET(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -y ${QGIS_PYTHON_OUTPUT_DIRECTORY}/_core.pyi)
 ENDIF((${SIP_VERSION_STR} VERSION_EQUAL 4.18) OR (${SIP_VERSION_STR} VERSION_GREATER 4.18))
+
+IF((${PYQT5_VERSION_STR} VERSION_EQUAL 5.15) OR (${PYQT5_VERSION_STR} VERSION_GREATER 5.15))
+  SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} VECTOR_MAPPED_TYPE)
+ENDIF((${PYQT5_VERSION_STR} VERSION_EQUAL 5.15) OR (${PYQT5_VERSION_STR} VERSION_GREATER 5.15))
+
 GENERATE_SIP_PYTHON_MODULE_CODE(qgis._core core/core.sip "${sip_files_core}" cpp_files)
 BUILD_SIP_PYTHON_MODULE(qgis._core core/core.sip ${cpp_files} "" qgis_core)
 SET(SIP_CORE_CPP_FILES ${cpp_files})

python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckerror.sip.in

@@ -199,6 +199,8 @@ its ``value`` Type for additional information.
 %End
 
 
+  private:
+    const QgsGeometryCheckError &operator=( const QgsGeometryCheckError & );
 };
 
 

python/analysis/auto_generated/vector/geometry_checker/qgssinglegeometrycheck.sip.in

@@ -109,6 +109,8 @@ The underlying single error.
 %End
 
 
+  private:
+    const QgsGeometryCheckErrorSingle &operator=( const QgsGeometryCheckErrorSingle & );
 };
 
 class QgsSingleGeometryCheck : QgsGeometryCheck

python/core/auto_generated/effects/qgspainteffect.sip.in

@@ -448,6 +448,8 @@ Sets the effect to be painted
 
 
 
+  private:
+    const QgsEffectPainter &operator=( const QgsEffectPainter & );
 };
 
 

python/core/auto_generated/qgsreadwritecontext.sip.in

@@ -153,6 +153,8 @@ This would happen when it gets out of scope.
 Creates a popper
 %End
     ~QgsReadWriteContextCategoryPopper();
+  private:
+    QgsReadWriteContextCategoryPopper &operator=( const QgsReadWriteContextCategoryPopper & );
 };
 
 /************************************************************************

python/core/auto_generated/qgsreadwritelocker.sip.in

@@ -58,6 +58,8 @@ Equivalent to doing ``changeMode( QgsReadWriteLocker.Unlock );``
 
     ~QgsReadWriteLocker();
 
+  private:
+    QgsReadWriteLocker &operator=( const QgsReadWriteLocker & );
 };
 
 /************************************************************************

python/core/auto_generated/qgsrenderedfeaturehandlerinterface.sip.in

@@ -48,6 +48,9 @@ Constructor for RenderedFeatureContext.
 %Docstring
 The render context which was used while rendering feature.
 %End
+
+      private:
+      RenderedFeatureContext &operator=( const RenderedFeatureContext & );
     };
 
     virtual void handleRenderedFeature( const QgsFeature &feature, const QgsGeometry &renderedBounds, const QgsRenderedFeatureHandlerInterface::RenderedFeatureContext &context ) = 0;

python/core/auto_generated/symbology/qgsrulebasedrenderer.sip.in

@@ -46,6 +46,9 @@ Feature to render
 %End
 
       QgsSymbol *symbol;
+
+      private:
+      RenderJob &operator=( const RenderJob & );
     };
 
     struct RenderLevel

python/core/conversions.sip

@@ -1435,6 +1435,7 @@ template <TYPE>
 %End
 };
 
+%If (VECTOR_MAPPED_TYPE)
 template <TYPE>
 %MappedType QVector< TYPE* >
 {
@@ -1507,6 +1508,7 @@ template <TYPE>
     return sipGetState(sipTransferObj);
 %End
 };
+%End
 
 %MappedType QMap<qint64, QgsFeature*>
 {

python/core/core.sip.in

@@ -99,6 +99,7 @@ done:
 %Import QtWidgets/QtWidgetsmod.sip
 
 %Feature ANDROID
+%Feature VECTOR_MAPPED_TYPE
 
 %Include conversions.sip
 %Include qgsexception.sip

python/server/auto_generated/qgsrequesthandler.sip.in

@@ -164,6 +164,8 @@ Returns the requested format string
 Returns ``True`` if the HTTP headers were already sent to the client
 %End
 
+  private:
+    QgsRequestHandler &operator=( const QgsRequestHandler & );
 };
 
 /************************************************************************

src/analysis/vector/geometry_checker/qgsgeometrycheckerror.h

@@ -234,6 +234,11 @@ class ANALYSIS_EXPORT QgsGeometryCheckError
     Status mStatus;
     QString mResolutionMessage;
 
+  private:
+
+#ifdef SIP_RUN
+    const QgsGeometryCheckError &operator=( const QgsGeometryCheckError & );
+#endif
 };
 
 Q_DECLARE_METATYPE( QgsGeometryCheckError * )

src/analysis/vector/geometry_checker/qgssinglegeometrycheck.h

@@ -129,6 +129,10 @@ class ANALYSIS_EXPORT QgsGeometryCheckErrorSingle : public QgsGeometryCheckError
     bool handleChanges( const QgsGeometryCheck::Changes &changes ) override SIP_SKIP;
 
   private:
+#ifdef SIP_RUN
+    const QgsGeometryCheckErrorSingle &operator=( const QgsGeometryCheckErrorSingle & );
+#endif
+
     QgsSingleGeometryCheckError *mError = nullptr;
 };
 

src/core/effects/qgspainteffect.h

@@ -431,6 +431,10 @@ class CORE_EXPORT QgsEffectPainter
     ///@endcond
 
   private:
+#ifdef SIP_RUN
+    const QgsEffectPainter &operator=( const QgsEffectPainter & );
+#endif
+
     QgsRenderContext &mRenderContext;
     QPainter *mPainter = nullptr;
     QgsPaintEffect *mEffect = nullptr;

src/core/qgsreadwritecontext.h

@@ -162,6 +162,10 @@ class CORE_EXPORT QgsReadWriteContextCategoryPopper
     QgsReadWriteContextCategoryPopper( QgsReadWriteContext &context ) : mContext( context ) {}
     ~QgsReadWriteContextCategoryPopper() {mContext.leaveCategory();}
   private:
+#ifdef SIP_RUN
+    QgsReadWriteContextCategoryPopper &operator=( const QgsReadWriteContextCategoryPopper & );
+#endif
+
     QgsReadWriteContext &mContext;
 };
 

src/core/qgsreadwritelocker.h

@@ -71,6 +71,10 @@ class CORE_EXPORT QgsReadWriteLocker
     ~QgsReadWriteLocker();
 
   private:
+#ifdef SIP_RUN
+    QgsReadWriteLocker &operator=( const QgsReadWriteLocker & );
+#endif
+
     QReadWriteLock &mLock;
     Mode mMode = Unlocked;
 };

src/core/qgsrenderedfeaturehandlerinterface.h

@@ -63,6 +63,11 @@ class CORE_EXPORT QgsRenderedFeatureHandlerInterface
        * The render context which was used while rendering feature.
        */
       const QgsRenderContext &renderContext;
+
+      private:
+#ifdef SIP_RUN
+      RenderedFeatureContext &operator=( const RenderedFeatureContext & );
+#endif
     };
 
     /**

src/core/symbology/qgsrulebasedrenderer.h

@@ -67,14 +67,19 @@ class CORE_EXPORT QgsRuleBasedRenderer : public QgsFeatureRenderer
     {
       RenderJob( QgsRuleBasedRenderer::FeatureToRender &_ftr, QgsSymbol *_s )
         : ftr( _ftr )
-        , symbol( _s )
+          , symbol( _s )
       {}
 
       //! Feature to render
       QgsRuleBasedRenderer::FeatureToRender &ftr;
 
       //! Symbol to render feature with (not owned by this object).
       QgsSymbol *symbol = nullptr;
+
+      private:
+#ifdef SIP_RUN
+      RenderJob &operator=( const RenderJob & );
+#endif
     };
 
     /**

src/server/qgsrequesthandler.h

@@ -142,6 +142,9 @@ class SERVER_EXPORT QgsRequestHandler
     bool headersSent() const;
 
   private:
+#ifdef SIP_RUN
+    QgsRequestHandler &operator=( const QgsRequestHandler & );
+#endif
 
     void setupParameters();