diff options
author | Marc Mutz <marc.mutz@qt.io> | 2022-06-20 20:03:51 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-06-21 17:40:54 +0000 |
commit | 8363f9c9ba622c25ef89a317c4437d7987bf5822 (patch) | |
tree | 09ea5bb030bc58f448edfad9efdcb756dbf062ac /src/animation | |
parent | 9a112d18cfd7b1841e6b7e2902be846cd0e1b402 (diff) | |
download | qt3d-8363f9c9ba622c25ef89a317c4437d7987bf5822.tar.gz |
QAnimationCallback: De-inline dtor of polymorphic class
... fixing Clang -Wweak-vtables warnings, which we'll soon add to
headersclean.
Task-number: QTBUG-45582
Change-Id: Iead4123af1d68db2cba842bd6f07419c219f0b73
Reviewed-by: Mike Krus <mike.krus@kdab.com>
(cherry picked from commit 42f6556fd2f03724e60504648c2af5ea6db3a7c5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/animation')
-rw-r--r-- | src/animation/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/animation/frontend/qanimationcallback.cpp | 51 | ||||
-rw-r--r-- | src/animation/frontend/qanimationcallback.h | 2 |
3 files changed, 53 insertions, 2 deletions
diff --git a/src/animation/CMakeLists.txt b/src/animation/CMakeLists.txt index f4a105e2f..4a8a13310 100644 --- a/src/animation/CMakeLists.txt +++ b/src/animation/CMakeLists.txt @@ -43,7 +43,7 @@ qt_internal_add_module(3DAnimation frontend/qabstractclipblendnode.cpp frontend/qabstractclipblendnode.h frontend/qabstractclipblendnode_p.h frontend/qadditiveclipblend.cpp frontend/qadditiveclipblend.h frontend/qadditiveclipblend_p.h frontend/qanimationaspect.cpp frontend/qanimationaspect.h frontend/qanimationaspect_p.h - frontend/qanimationcallback.h + frontend/qanimationcallback.cpp frontend/qanimationcallback.h frontend/qanimationclip.cpp frontend/qanimationclip.h frontend/qanimationclip_p.h frontend/qanimationclipdata.cpp frontend/qanimationclipdata.h frontend/qanimationcliploader.cpp frontend/qanimationcliploader.h frontend/qanimationcliploader_p.h diff --git a/src/animation/frontend/qanimationcallback.cpp b/src/animation/frontend/qanimationcallback.cpp new file mode 100644 index 000000000..e24cccd2d --- /dev/null +++ b/src/animation/frontend/qanimationcallback.cpp @@ -0,0 +1,51 @@ +/**************************************************************************** +** +** Copyright (C) 2022 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt3D 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$ +** +****************************************************************************/ + +#include <Qt3DAnimation/qanimationcallback.h> + +QT_BEGIN_NAMESPACE + +namespace Qt3DAnimation { + +QAnimationCallback::~QAnimationCallback() + = default; + +} // namespace Qt3DAnimation + +QT_END_NAMESPACE diff --git a/src/animation/frontend/qanimationcallback.h b/src/animation/frontend/qanimationcallback.h index 89547699b..295bcc533 100644 --- a/src/animation/frontend/qanimationcallback.h +++ b/src/animation/frontend/qanimationcallback.h @@ -56,7 +56,7 @@ public: }; Q_DECLARE_FLAGS(Flags, Flag) - virtual ~QAnimationCallback() { } + virtual ~QAnimationCallback(); virtual void valueChanged(const QVariant &value) = 0; }; |