diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-12-10 13:51:40 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-12-10 17:53:06 +0200 |
| commit | 979b9335e5cec4a4556624dfab06d088b82cec36 (patch) | |
| tree | ab2c9463ea3e4a529e52943a823093ee6901eb0f /src/corelib/serialization/qcborarray.h | |
| parent | 30e32870a052fda1a23099e46864242e52d94a17 (diff) | |
| parent | 90210d5d9c4029057035019f144212922494ff0a (diff) | |
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'src/corelib/serialization/qcborarray.h')
| -rw-r--r-- | src/corelib/serialization/qcborarray.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/serialization/qcborarray.h b/src/corelib/serialization/qcborarray.h index e06544f245..fe06b8630f 100644 --- a/src/corelib/serialization/qcborarray.h +++ b/src/corelib/serialization/qcborarray.h @@ -214,7 +214,7 @@ public: bool contains(const QCborValue &value) const; int compare(const QCborArray &other) const noexcept Q_DECL_PURE_FUNCTION; -#if 0 && QT_HAS_INCLUDE(<compare>) +#if 0 && __has_include(<compare>) std::strong_ordering operator<=>(const QCborArray &other) const { int c = compare(other); |