diff options
Diffstat (limited to 'src/extras/3dtext/qextrudedtextmesh.cpp')
| -rw-r--r-- | src/extras/3dtext/qextrudedtextmesh.cpp | 65 |
1 files changed, 10 insertions, 55 deletions
diff --git a/src/extras/3dtext/qextrudedtextmesh.cpp b/src/extras/3dtext/qextrudedtextmesh.cpp index fc93726d2..9c141f2c7 100644 --- a/src/extras/3dtext/qextrudedtextmesh.cpp +++ b/src/extras/3dtext/qextrudedtextmesh.cpp @@ -1,52 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB). -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** 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. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB). +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause #include "qextrudedtextmesh.h" #include "qextrudedtextgeometry.h" @@ -65,13 +18,13 @@ namespace Qt3DExtras { */ /*! - * \qmlproperty QString Qt3DExtras::ExtrudedTextMesh::text + * \qmlproperty QString Qt3D.Extras::ExtrudedTextMesh::text * * Holds the text used for the mesh. */ /*! - * \qmlproperty QFont Qt3DExtras::ExtrudedTextMesh::font + * \qmlproperty QFont Qt3D.Extras::ExtrudedTextMesh::font * * Holds the font of the text. @@ -81,7 +34,7 @@ namespace Qt3DExtras { */ /*! - * \qmlproperty float Qt3DExtras::ExtrudedTextMesh::depth + * \qmlproperty float Qt3D.Extras::ExtrudedTextMesh::depth * * Holds the extrusion depth of the text. */ @@ -131,7 +84,7 @@ void QExtrudedTextMesh::setDepth(float depth) } /*! - * \property QExtrudedTextMesh::text + * \property Qt3DExtras::QExtrudedTextMesh::text * * Holds the text used for the mesh. */ @@ -141,7 +94,7 @@ QString QExtrudedTextMesh::text() const } /*! - * \property QExtrudedTextMesh::font + * \property Qt3DExtras::QExtrudedTextMesh::font * * Holds the font of the text. * @@ -155,7 +108,7 @@ QFont QExtrudedTextMesh::font() const } /*! - * \property QExtrudedTextMesh::depth + * \property Qt3DExtras::QExtrudedTextMesh::depth * * Holds the extrusion depth of the text. */ @@ -167,3 +120,5 @@ float QExtrudedTextMesh::depth() const } // namespace Qt3DExtras QT_END_NAMESPACE + +#include "moc_qextrudedtextmesh.cpp" |