sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-15 00:02:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add operator for flgs and update docs

Browse Source
This commit is contained in:
Alessandro Pasotti 2021-11-04 16:12:25 +01:00 committed by Nyall Dawson
parent 2fbb830c16
commit d4876f3842
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
python/core/auto_generated/qgis.sip.in
View File

@ -110,7 +110,6 @@ The development version
typedef QFlags<Qgis::VectorLayerTypeFlag> VectorLayerTypeFlags;
enum class PythonMacroMode
{
Never,
@ -828,6 +827,8 @@ QFlags<Qgis::MapSettingsFlag> operator|(Qgis::MapSettingsFlag f1, QFlags<Qgis::M
QFlags<Qgis::RenderContextFlag> operator|(Qgis::RenderContextFlag f1, QFlags<Qgis::RenderContextFlag> f2);
QFlags<Qgis::VectorLayerTypeFlag> operator|(Qgis::VectorLayerTypeFlag f1, QFlags<Qgis::VectorLayerTypeFlag> f2);

2
python/core/auto_generated/vector/qgsvectorlayer.sip.in
View File

@ -468,7 +468,7 @@ Returns ``True`` if the layer is a query (SQL) layer.
Qgis::VectorLayerTypeFlags vectorLayerTypeFlags() const;
%Docstring
Returns ``True`` if the layer is a query (SQL) layer.
Returns the vector layer type flags.
.. seealso:: :py:func:`isSqlQuery`

2
src/core/qgis.h
View File

@ -148,7 +148,6 @@ class CORE_EXPORT Qgis
//! Vector layer type flags
Q_DECLARE_FLAGS( VectorLayerTypeFlags, VectorLayerTypeFlag )
/**
* Authorisation to run Python Macros
* \since QGIS 3.10
@ -1324,6 +1323,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS( Qgis::AnnotationItemFlags )
Q_DECLARE_OPERATORS_FOR_FLAGS( Qgis::AnnotationItemGuiFlags )
Q_DECLARE_OPERATORS_FOR_FLAGS( Qgis::MapSettingsFlags )
Q_DECLARE_OPERATORS_FOR_FLAGS( Qgis::RenderContextFlags )
Q_DECLARE_OPERATORS_FOR_FLAGS( Qgis::VectorLayerTypeFlags )
// hack to workaround warnings when casting void pointers

2
src/core/vector/qgsvectorlayer.h
View File

@ -583,7 +583,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte
bool isSqlQuery() const;
/**
* Returns TRUE if the layer is a query (SQL) layer.
* Returns the vector layer type flags.
*
* \see isSqlQuery()
* \since QGIS 3.24