diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 16:16:29 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 16:23:19 +0200 |
| commit | f4b4c4f79b629498f3cddbbc10df8c1b4d6020d9 (patch) | |
| tree | 4119707660438ff58bd51f9cbe0f9e2a33f4b806 /src/corelib/kernel/qmetatype_p.h | |
| parent | 9bd6cec74dbbc5aece55dc0c8808494db29b9963 (diff) | |
| parent | 93f2f33a49f6c96a4f94f344edf03164ed944d02 (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
Change-Id: I3a1d7673c3c20019ab12a2ea0a60f1619920a34c
Diffstat (limited to 'src/corelib/kernel/qmetatype_p.h')
| -rw-r--r-- | src/corelib/kernel/qmetatype_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/kernel/qmetatype_p.h b/src/corelib/kernel/qmetatype_p.h index fa7208369a..d743d5a5c7 100644 --- a/src/corelib/kernel/qmetatype_p.h +++ b/src/corelib/kernel/qmetatype_p.h @@ -206,7 +206,9 @@ template<> struct TypeDefinition<QCborArray> { static const bool IsAvailable = f template<> struct TypeDefinition<QCborMap> { static const bool IsAvailable = false; }; template<> struct TypeDefinition<QCborSimpleType> { static const bool IsAvailable = false; }; template<> struct TypeDefinition<QCborValue> { static const bool IsAvailable = false; }; +#if QT_CONFIG(easingcurve) template<> struct TypeDefinition<QEasingCurve> { static const bool IsAvailable = false; }; +#endif template<> struct TypeDefinition<QJsonArray> { static const bool IsAvailable = false; }; template<> struct TypeDefinition<QJsonDocument> { static const bool IsAvailable = false; }; template<> struct TypeDefinition<QJsonObject> { static const bool IsAvailable = false; }; |