Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
since 3.4
  • Loading branch information
PeterPetrik committed May 29, 2018
1 parent 2770f6c commit 093d53a
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion src/core/qgstessellator.h
Expand Up @@ -35,7 +35,7 @@ class QgsMultiPolygon;
*
* Optionally provides extrusion by adding triangles that serve as walls when extrusion height is non-zero.
*
* \since QGIS 3.2 (since QGIS 3.0 in QGIS_3D library)
* \since QGIS 3.4 (since QGIS 3.0 in QGIS_3D library)
*/
class CORE_EXPORT QgsTessellator
{
Expand Down
2 changes: 1 addition & 1 deletion src/quickgui/qgsquickfeaturehighlight.h
Expand Up @@ -32,7 +32,7 @@ class QgsQuickMapSettings;
*
* \note QML Type: FeatureModelHighlight
*
* \since QGIS 3.2
* \since QGIS 3.4
*/
class QUICK_EXPORT QgsQuickFeatureHighlight : public QQuickItem
{
Expand Down
4 changes: 2 additions & 2 deletions src/quickgui/qgsquickfeaturelayerpair.h
Expand Up @@ -35,7 +35,7 @@ class QgsVectorLayer;
*
* \note QML Type: QgsQuickFeatureLayerPair
*
* \since QGIS 3.2
* \since QGIS 3.4
*/
class QUICK_EXPORT QgsQuickFeatureLayerPair
{
Expand Down Expand Up @@ -82,7 +82,7 @@ class QUICK_EXPORT QgsQuickFeatureLayerPair
//! \copydoc QgsQuickFeatureLayerPair::feature
QgsFeature feature() const;

//! \copydoc QgsQuickFeatureLayerPair::isValid
//! \copydoc QgsQuickFeatureLayerPair::valid
bool isValid() const;

bool operator==( const QgsQuickFeatureLayerPair &other ) const;
Expand Down
2 changes: 1 addition & 1 deletion src/quickgui/qgsquickhighlightsgnode.h
Expand Up @@ -31,7 +31,7 @@
*
* \note QML Type: not exported
*
* \since QGIS 3.2
* \since QGIS 3.4
*/
class QUICK_EXPORT QgsQuickHighlightSGNode : public QSGNode
{
Expand Down
2 changes: 1 addition & 1 deletion src/quickgui/qgsquickidentifykit.h
Expand Up @@ -41,7 +41,7 @@ class QgsVectorLayer;
*
* \note QML Type: IdentifyKit
*
* \since QGIS 3.2
* \since QGIS 3.4
*/
class QUICK_EXPORT QgsQuickIdentifyKit : public QObject
{
Expand Down
2 changes: 1 addition & 1 deletion src/quickgui/qgsquickmaptransform.h
Expand Up @@ -32,7 +32,7 @@ class QgsQuickMapSettings;
*
* \note QML Type: MapTransform
*
* \since QGIS 3.2
* \since QGIS 3.4
*/
class QUICK_EXPORT QgsQuickMapTransform : public QQuickTransform
{
Expand Down
5 changes: 3 additions & 2 deletions src/quickgui/qgsquickutils.h
Expand Up @@ -26,9 +26,8 @@
#include "qgsquickmapsettings.h"
#include "qgsquickfeaturelayerpair.h"
#include "qgis_quick.h"
#include "qgsfeature.h"


class QgsFeature;
class QgsVectorLayer;
class QgsCoordinateReferenceSystem;

Expand Down Expand Up @@ -81,6 +80,8 @@ class QUICK_EXPORT QgsQuickUtils: public QObject
* QgsQuickFeature factory for tuple of QgsFeature and QgsVectorLayer usud in QgsQUick library.
* \param feature QgsFeature linked to new QgsQuickFeature instance.
* \param layer QgsVectorLayer which the feature belongs to, optional.
*
* \since QGIS 3.4
*/
Q_INVOKABLE QgsQuickFeatureLayerPair featureFactory( const QgsFeature &feature, QgsVectorLayer *layer = nullptr ) const;

Expand Down

0 comments on commit 093d53a

Please sign in to comment.