diff --git a/python/PyQt6/core/auto_generated/qgsscreenproperties.sip.in b/python/PyQt6/core/auto_generated/qgsscreenproperties.sip.in index fe590eaa291..53a5ed1ecb3 100644 --- a/python/PyQt6/core/auto_generated/qgsscreenproperties.sip.in +++ b/python/PyQt6/core/auto_generated/qgsscreenproperties.sip.in @@ -113,6 +113,8 @@ settings. }; + + /************************************************************************ * This file has been generated automatically from * * * diff --git a/python/PyQt6/core/auto_generated/qgstiles.sip.in b/python/PyQt6/core/auto_generated/qgstiles.sip.in index be2352a88fe..2e985d93b13 100644 --- a/python/PyQt6/core/auto_generated/qgstiles.sip.in +++ b/python/PyQt6/core/auto_generated/qgstiles.sip.in @@ -62,6 +62,7 @@ Returns tile coordinates in a formatted string + class QgsTileRange { %Docstring(signature="appended") diff --git a/python/PyQt6/core/auto_generated/qgsunsetattributevalue.sip.in b/python/PyQt6/core/auto_generated/qgsunsetattributevalue.sip.in index c9b5c49e5d0..60b6488b4f2 100644 --- a/python/PyQt6/core/auto_generated/qgsunsetattributevalue.sip.in +++ b/python/PyQt6/core/auto_generated/qgsunsetattributevalue.sip.in @@ -57,6 +57,7 @@ Returns the original data provider's default value clause. bool operator==( const QgsUnsetAttributeValue &value, const QString &other ); + bool operator!=( const QgsUnsetAttributeValue &value, const QString &other ); diff --git a/python/core/auto_generated/qgsscreenproperties.sip.in b/python/core/auto_generated/qgsscreenproperties.sip.in index fe590eaa291..53a5ed1ecb3 100644 --- a/python/core/auto_generated/qgsscreenproperties.sip.in +++ b/python/core/auto_generated/qgsscreenproperties.sip.in @@ -113,6 +113,8 @@ settings. }; + + /************************************************************************ * This file has been generated automatically from * * * diff --git a/python/core/auto_generated/qgstiles.sip.in b/python/core/auto_generated/qgstiles.sip.in index be2352a88fe..2e985d93b13 100644 --- a/python/core/auto_generated/qgstiles.sip.in +++ b/python/core/auto_generated/qgstiles.sip.in @@ -62,6 +62,7 @@ Returns tile coordinates in a formatted string + class QgsTileRange { %Docstring(signature="appended") diff --git a/python/core/auto_generated/qgsunsetattributevalue.sip.in b/python/core/auto_generated/qgsunsetattributevalue.sip.in index c9b5c49e5d0..60b6488b4f2 100644 --- a/python/core/auto_generated/qgsunsetattributevalue.sip.in +++ b/python/core/auto_generated/qgsunsetattributevalue.sip.in @@ -57,6 +57,7 @@ Returns the original data provider's default value clause. bool operator==( const QgsUnsetAttributeValue &value, const QString &other ); + bool operator!=( const QgsUnsetAttributeValue &value, const QString &other ); diff --git a/src/core/qgis.h b/src/core/qgis.h index e540cac6b5f..a3b523edc48 100644 --- a/src/core/qgis.h +++ b/src/core/qgis.h @@ -6941,7 +6941,6 @@ typedef unsigned long long qgssize; __pragma(warning(disable:4702)) #define Q_NOWARN_UNREACHABLE_POP \ __pragma(warning(pop)) - #else #define Q_NOWARN_DEPRECATED_PUSH diff --git a/src/core/qgsscreenproperties.h b/src/core/qgsscreenproperties.h index c3ef2d994e4..845ba7a7da3 100644 --- a/src/core/qgsscreenproperties.h +++ b/src/core/qgsscreenproperties.h @@ -126,6 +126,16 @@ class CORE_EXPORT QgsScreenProperties double mPhysicalDpi = 96; }; +#ifndef SIP_RUN +#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) || defined(__clang__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wattributes" +#elif defined(_MSC_VER) +__pragma( warning( push ) ) +__pragma( warning( disable: 4273 ) ) +#endif +#endif + /** * Returns a hash for a screen \a properties. * @@ -136,4 +146,12 @@ CORE_EXPORT inline uint qHash( const QgsScreenProperties &properties ) SIP_SKIP return qHash( properties.devicePixelRatio() ) + qHash( properties.physicalDpi() ); } +#ifndef SIP_RUN +#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) || defined(__clang__) +#pragma GCC diagnostic pop +#elif defined(_MSC_VER) +__pragma( warning( pop ) ) +#endif +#endif + #endif // QGSSCREENPROPERTIES_H diff --git a/src/core/qgstiles.h b/src/core/qgstiles.h index e1457e8bf8b..cae6273ea6e 100644 --- a/src/core/qgstiles.h +++ b/src/core/qgstiles.h @@ -72,6 +72,16 @@ class CORE_EXPORT QgsTileXYZ int mZoomLevel = -1; }; +#ifndef SIP_RUN +#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) || defined(__clang__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wattributes" +#elif defined(_MSC_VER) +__pragma( warning( push ) ) +__pragma( warning( disable: 4273 ) ) +#endif +#endif + /** * Returns a hash for a tile \a id. * @@ -85,6 +95,13 @@ CORE_EXPORT inline uint qHash( QgsTileXYZ id ) SIP_SKIP return h1 ^ ( h2 << 1 ) ^ ( h3 << 2 ); } +#ifndef SIP_RUN +#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) || defined(__clang__) +#pragma GCC diagnostic pop +#elif defined(_MSC_VER) +__pragma( warning( pop ) ) +#endif +#endif /** * \ingroup core diff --git a/src/core/qgsunsetattributevalue.h b/src/core/qgsunsetattributevalue.h index d4d4d35eff4..0e9d2e86b30 100644 --- a/src/core/qgsunsetattributevalue.h +++ b/src/core/qgsunsetattributevalue.h @@ -19,6 +19,7 @@ #define QGSUNSETATTRIBUTEVALUE_H #include "qgis_core.h" +#include "qgis.h" #include #include @@ -80,12 +81,29 @@ class CORE_EXPORT QgsUnsetAttributeValue Q_DECLARE_METATYPE( QgsUnsetAttributeValue ) +#ifndef SIP_RUN +#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) || defined(__clang__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wattributes" +#elif defined(_MSC_VER) +__pragma( warning( push ) ) +__pragma( warning( disable: 4273 ) ) +#endif +#endif inline bool CORE_EXPORT operator==( const QgsUnsetAttributeValue &value, const QString &other ) { return other == value.defaultValueClause(); } +#ifndef SIP_RUN +#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) || defined(__clang__) +#pragma GCC diagnostic pop +#elif defined(_MSC_VER) +__pragma( warning( pop ) ) +#endif +#endif + inline bool operator!=( const QgsUnsetAttributeValue &value, const QString &other ) { return other != value.defaultValueClause();