diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2018-01-25 14:14:05 -0800 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2018-07-04 03:04:15 +0000 |
| commit | 6c64a9b2d29d5de054d1d8ccec2050c28767c10c (patch) | |
| tree | 097da82dfcf980d19911ba86b56a1b025dfa23d2 /src/corelib/kernel/qvariant.cpp | |
| parent | 71e41d7230650e4b25cfe0f2ac8e3c87e8e4119e (diff) | |
Metatype: make the Qt CBOR value-like types built-in meta types
This change only adds them to the registry and reserves the IDs. The
next commit will handle conversions.
Change-Id: I56b444f9d6274221a3b7fffd150d2d49f40940c2
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/corelib/kernel/qvariant.cpp')
| -rw-r--r-- | src/corelib/kernel/qvariant.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index b41a883e80..827f3cbf48 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2016 The Qt Company Ltd. -** Copyright (C) 2016 Intel Corporation. +** Copyright (C) 2018 Intel Corporation. ** Copyright (C) 2015 Olivier Goffart <ogoffart@woboq.com> ** Contact: https://www.qt.io/licensing/ ** @@ -60,6 +60,9 @@ #include "qabstractitemmodel.h" #endif #ifndef QT_BOOTSTRAPPED +#include "qcborarray.h" +#include "qcborcommon.h" +#include "qcbormap.h" #include "qjsonvalue.h" #include "qjsonobject.h" #include "qjsonarray.h" |