From: Ivailo Monev Date: Tue, 21 May 2019 20:16:43 +0000 (+0000) Subject: partitially revert https://github.com/fluxer/katie/commit/bdb84187dab55fda3c4cbe7c805... X-Git-Tag: 4.12.0~5998 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=bb2ee2d8437d464dedc76306b859aa68605a0290;p=kde%2FKatie.git partitially revert https://github.com/fluxer/katie/commit/bdb84187dab55fda3c4cbe7c805f9dffbb1f08de Signed-off-by: Ivailo Monev --- diff --git a/src/core/kernel/qobject.cpp b/src/core/kernel/qobject.cpp index be6eda932..d44af5d3e 100644 --- a/src/core/kernel/qobject.cpp +++ b/src/core/kernel/qobject.cpp @@ -116,6 +116,8 @@ void (*QAbstractDeclarativeData::destroyed)(QAbstractDeclarativeData *, QObject void (*QAbstractDeclarativeData::parentChanged)(QAbstractDeclarativeData *, QObject *, QObject *) = 0; void (*QAbstractDeclarativeData::objectNameChanged)(QAbstractDeclarativeData *, QObject *) = 0; +QObjectData::~QObjectData() {} + QObjectPrivate::QObjectPrivate(int version) : threadData(0), connectionLists(0), senders(0), currentSender(0), currentChildBeingDeleted(Q_NULLPTR) { diff --git a/src/core/kernel/qobject.h b/src/core/kernel/qobject.h index 3a1427016..a51c05dee 100644 --- a/src/core/kernel/qobject.h +++ b/src/core/kernel/qobject.h @@ -75,6 +75,7 @@ Q_CORE_EXPORT QObject *qt_qFindChild_helper(const QObject *parent, const QString class QObjectData { public: + virtual ~QObjectData() = 0; QObject *q_ptr; QObject *parent; QObjectList children;