diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2020-03-16 08:47:45 +0100 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2020-03-17 09:17:08 +0100 |
| commit | cfcf88e259599131b344dbbe0372d3b03f7d35ec (patch) | |
| tree | f85f84f7022b4590173c90efc290e2b617aa1fe6 /src/corelib/kernel/qmetatype.h | |
| parent | dee55af0a5359bb3b57a89cf3065ffca9d8506da (diff) | |
Fix compilation with -no-feature-regularexpression
This -no-feature has probably not been tested for a while
and seems to have rotted a bit, both some unprotected
uses and some warnings on unused parameters.
Change-Id: Ie20a06c78d3b4c36860dab49d6615eaa8ffc9077
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/kernel/qmetatype.h')
| -rw-r--r-- | src/corelib/kernel/qmetatype.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 61f9a42850..6d34402177 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -111,6 +111,13 @@ inline Q_DECL_CONSTEXPR int qMetaTypeId(); #define QT_FOR_EACH_STATIC_ITEMMODEL_CLASS(F) #endif +#if QT_CONFIG(regularexpression) +# define QT_FOR_EACH_STATIC_REGULAR_EXPRESSION(F) \ + F(QRegularExpression, 44, QRegularExpression) +#else +# define QT_FOR_EACH_STATIC_REGULAR_EXPRESSION(F) +#endif + #define QT_FOR_EACH_STATIC_CORE_CLASS(F)\ F(QChar, 7, QChar) \ F(QString, 10, QString) \ @@ -134,7 +141,7 @@ inline Q_DECL_CONSTEXPR int qMetaTypeId(); QT_FOR_EACH_STATIC_EASINGCURVE(F) \ F(QUuid, 30, QUuid) \ F(QVariant, 41, QVariant) \ - F(QRegularExpression, 44, QRegularExpression) \ + QT_FOR_EACH_STATIC_REGULAR_EXPRESSION(F) \ F(QJsonValue, 45, QJsonValue) \ F(QJsonObject, 46, QJsonObject) \ F(QJsonArray, 47, QJsonArray) \ |