diff options
Diffstat (limited to 'src/corelib/serialization/qcborcommon.h')
| -rw-r--r-- | src/corelib/serialization/qcborcommon.h | 49 |
1 files changed, 6 insertions, 43 deletions
diff --git a/src/corelib/serialization/qcborcommon.h b/src/corelib/serialization/qcborcommon.h index 1497da3d2e..bd7a93dfe7 100644 --- a/src/corelib/serialization/qcborcommon.h +++ b/src/corelib/serialization/qcborcommon.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2018 Intel Corporation. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2018 Intel Corporation. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QCBORCOMMON_H #define QCBORCOMMON_H @@ -50,7 +14,6 @@ /* X11 headers use these values too, but as defines */ #if defined(False) && defined(True) -# define QT_X11_DEFINES_FOUND 1 # undef True # undef False #endif @@ -133,9 +96,9 @@ Q_CORE_EXPORT QDebug operator<<(QDebug, QCborKnownTags tg); Q_CORE_EXPORT QDebug operator<<(QDebug, QCborTag tg); #endif -#if !defined(QT_NO_DEBUG_STREAM) -QDataStream &operator<<(QDataStream &ds, QCborSimpleType st); -QDataStream &operator>>(QDataStream &ds, QCborSimpleType &st); +#if !defined(QT_NO_DATASTREAM) +Q_CORE_EXPORT QDataStream &operator<<(QDataStream &ds, QCborSimpleType st); +Q_CORE_EXPORT QDataStream &operator>>(QDataStream &ds, QCborSimpleType &st); #endif inline size_t qHash(QCborSimpleType tag, size_t seed = 0) @@ -152,7 +115,7 @@ enum class QCborNegativeInteger : quint64 {}; QT_END_NAMESPACE -Q_DECLARE_METATYPE(QCborTag) +QT_DECL_METATYPE_EXTERN(QCborTag, Q_CORE_EXPORT) // To avoid changing namespace we need to reinstate defines, even though our .cpp // will then have to remove them again. |