diff options
Diffstat (limited to 'src/core/changes')
36 files changed, 379 insertions, 35 deletions
diff --git a/src/core/changes/changes.pri b/src/core/changes/changes.pri index 49d560a56..11d66a83e 100644 --- a/src/core/changes/changes.pri +++ b/src/core/changes/changes.pri @@ -35,7 +35,9 @@ HEADERS += \ $$PWD/qpropertyvalueaddedchange.h \ $$PWD/qpropertyvalueaddedchange_p.h \ $$PWD/qpropertyvalueremovedchange.h \ - $$PWD/qpropertyvalueremovedchange_p.h + $$PWD/qpropertyvalueremovedchange_p.h \ + $$PWD/qnodecommand.h \ + $$PWD/qnodecommand_p.h SOURCES += \ $$PWD/qscenechange.cpp \ @@ -54,4 +56,5 @@ SOURCES += \ $$PWD/qpropertynodeaddedchange.cpp \ $$PWD/qpropertynoderemovedchange.cpp \ $$PWD/qpropertyvalueaddedchange.cpp \ - $$PWD/qpropertyvalueremovedchange.cpp + $$PWD/qpropertyvalueremovedchange.cpp \ + $$PWD/qnodecommand.cpp diff --git a/src/core/changes/qcomponentaddedchange.cpp b/src/core/changes/qcomponentaddedchange.cpp index 985567849..e00c4ffab 100644 --- a/src/core/changes/qcomponentaddedchange.cpp +++ b/src/core/changes/qcomponentaddedchange.cpp @@ -39,9 +39,11 @@ #include "qcomponentaddedchange.h" #include "qcomponentaddedchange_p.h" + #include <Qt3DCore/qcomponent.h> #include <Qt3DCore/qentity.h> -#include <private/qnode_p.h> + +#include <Qt3DCore/private/qnode_p.h> QT_BEGIN_NAMESPACE diff --git a/src/core/changes/qcomponentaddedchange_p.h b/src/core/changes/qcomponentaddedchange_p.h index 99550c92f..5eb453363 100644 --- a/src/core/changes/qcomponentaddedchange_p.h +++ b/src/core/changes/qcomponentaddedchange_p.h @@ -51,10 +51,11 @@ // We mean it. // -#include <Qt3DCore/private/qt3dcore_global_p.h> -#include <private/qscenechange_p.h> #include <Qt3DCore/qnodeid.h> +#include <Qt3DCore/private/qscenechange_p.h> +#include <Qt3DCore/private/qt3dcore_global_p.h> + struct QMetaObject; QT_BEGIN_NAMESPACE diff --git a/src/core/changes/qcomponentremovedchange.cpp b/src/core/changes/qcomponentremovedchange.cpp index 30863cd89..5e5dfa5aa 100644 --- a/src/core/changes/qcomponentremovedchange.cpp +++ b/src/core/changes/qcomponentremovedchange.cpp @@ -39,9 +39,11 @@ #include "qcomponentremovedchange.h" #include "qcomponentremovedchange_p.h" + #include <Qt3DCore/qcomponent.h> #include <Qt3DCore/qentity.h> -#include <private/qnode_p.h> + +#include <Qt3DCore/private/qnode_p.h> QT_BEGIN_NAMESPACE diff --git a/src/core/changes/qcomponentremovedchange_p.h b/src/core/changes/qcomponentremovedchange_p.h index ff5c71f84..5284c7bbd 100644 --- a/src/core/changes/qcomponentremovedchange_p.h +++ b/src/core/changes/qcomponentremovedchange_p.h @@ -51,10 +51,11 @@ // We mean it. // -#include <Qt3DCore/private/qt3dcore_global_p.h> -#include <private/qscenechange_p.h> #include <Qt3DCore/qnodeid.h> +#include <Qt3DCore/private/qscenechange_p.h> +#include <Qt3DCore/private/qt3dcore_global_p.h> + struct QMetaObject; QT_BEGIN_NAMESPACE diff --git a/src/core/changes/qdynamicpropertyupdatedchange_p.h b/src/core/changes/qdynamicpropertyupdatedchange_p.h index 729ae44d0..c71c2a71a 100644 --- a/src/core/changes/qdynamicpropertyupdatedchange_p.h +++ b/src/core/changes/qdynamicpropertyupdatedchange_p.h @@ -51,10 +51,11 @@ // We mean it. // -#include <private/qpropertyupdatedchangebase_p.h> #include <QtCore/qbytearray.h> #include <QtCore/qvariant.h> +#include <Qt3DCore/private/qpropertyupdatedchangebase_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DCore { diff --git a/src/core/changes/qnodecommand.cpp b/src/core/changes/qnodecommand.cpp new file mode 100644 index 000000000..fc7e01697 --- /dev/null +++ b/src/core/changes/qnodecommand.cpp @@ -0,0 +1,151 @@ +/**************************************************************************** +** +** Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt3D module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** 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 http://www.qt.io/terms-conditions. For further +** information use the contact form at http://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.LGPLv3 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.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 later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qnodecommand.h" +#include "qnodecommand_p.h" +#include <Qt3DCore/qnode.h> +#include <Qt3DCore/private/qnode_p.h> + +QT_BEGIN_NAMESPACE + +namespace Qt3DCore { + +QNodeCommandPrivate::QNodeCommandPrivate() + : QSceneChangePrivate() + , m_commandId(createId()) + , m_replyToCommandId() +{ +} + +QNodeCommand::CommandId QNodeCommandPrivate::createId() +{ + static QBasicAtomicInteger<QNodeCommand::CommandId> next = Q_BASIC_ATOMIC_INITIALIZER(0); + return next.fetchAndAddRelaxed(1) + 1; +} + +/*! + * \class Qt3DCore::QNodeCommand + * \inheaderfile Qt3DCore/QNodeCommand + * \inherits Qt3DCore::QSceneChange + * \inmodule Qt3DCore + * \since 5.9 + * \brief The QNodeCommand class is the base class for all CommandRequested QSceneChange events + * + * The QNodeCommand class is the base class for all QSceneChange events that + * have the changeType() CommandRequested. + * + * You can subclass this to create your own node update types for communication between + * your QNode and QBackendNode subclasses when writing your own aspects. + */ + +/*! + * \typedef Qt3DCore::QNodeCommandPtr + * \relates Qt3DCore::QNodeCommand + * + * A shared pointer for QNodeCommand. + */ + +/*! + * Constructs a new QNodeCommand with \a node. + */ +QNodeCommand::QNodeCommand(QNodeId id) + : QSceneChange(*new QNodeCommandPrivate(), CommandRequested, id) +{ +} + +QNodeCommand::QNodeCommand(QNodeCommandPrivate &dd, QNodeId id) + : QSceneChange(dd, CommandRequested, id) +{ +} + +QNodeCommand::~QNodeCommand() +{ +} + +/*! + * \return commandId. + */ +QNodeCommand::CommandId QNodeCommand::commandId() const +{ + Q_D(const QNodeCommand); + return d->m_commandId; +} + +/*! + * \return name. + */ +QString QNodeCommand::name() const +{ + Q_D(const QNodeCommand); + return d->m_name; +} + +void QNodeCommand::setName(const QString &name) +{ + Q_D(QNodeCommand); + d->m_name = name; +} + +/*! + * \return data. + */ +QVariant QNodeCommand::data() const +{ + Q_D(const QNodeCommand); + return d->m_data; +} + +void QNodeCommand::setData(const QVariant &data) +{ + Q_D(QNodeCommand); + d->m_data = data; +} + +QNodeCommand::CommandId QNodeCommand::inReplyTo() const +{ + Q_D(const QNodeCommand); + return d->m_replyToCommandId; +} + +void QNodeCommand::setReplyToCommandId(QNodeCommand::CommandId id) +{ + Q_D(QNodeCommand); + d->m_replyToCommandId = id; +} + +} // namespace Qt3DCore + +QT_END_NAMESPACE diff --git a/src/core/changes/qnodecommand.h b/src/core/changes/qnodecommand.h new file mode 100644 index 000000000..c02365a59 --- /dev/null +++ b/src/core/changes/qnodecommand.h @@ -0,0 +1,85 @@ +/**************************************************************************** +** +** Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt3D module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** 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 http://www.qt.io/terms-conditions. For further +** information use the contact form at http://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.LGPLv3 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.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 later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QT3DCORE_QNODECOMMAND_H +#define QT3DCORE_QNODECOMMAND_H + +#include <Qt3DCore/qt3dcore_global.h> +#include <Qt3DCore/qscenechange.h> + +#include <QtCore/qsharedpointer.h> + +QT_BEGIN_NAMESPACE + +namespace Qt3DCore { + +class QNodeCommandPrivate; + +class QT3DCORESHARED_EXPORT QNodeCommand : public QSceneChange +{ +public: +#if defined(Q_ATOMIC_INT64_IS_SUPPORTED) + typedef quint64 CommandId; +#else + typedef quint32 CommandId; +#endif + + explicit QNodeCommand(QNodeId id); + ~QNodeCommand(); + + CommandId commandId() const; + + QString name() const; + void setName(const QString &name); + QVariant data() const; + void setData(const QVariant &data); + CommandId inReplyTo() const; + void setReplyToCommandId(CommandId id); + +protected: + QNodeCommand(QNodeCommandPrivate &dd, QNodeId id); + +private: + Q_DECLARE_PRIVATE(QNodeCommand) +}; + +typedef QSharedPointer<QNodeCommand> QNodeCommandPtr; + +} // namespace Qt3DCore + +QT_END_NAMESPACE + +#endif // QT3DCORE_QNODECOMMAND_H diff --git a/src/core/changes/qnodecommand_p.h b/src/core/changes/qnodecommand_p.h new file mode 100644 index 000000000..09be873f5 --- /dev/null +++ b/src/core/changes/qnodecommand_p.h @@ -0,0 +1,75 @@ +/**************************************************************************** +** +** Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt3D module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** 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 http://www.qt.io/terms-conditions. For further +** information use the contact form at http://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.LGPLv3 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.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 later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QT3DCORE_QNODECOMMAND_P_H +#define QT3DCORE_QNODECOMMAND_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists for the convenience +// of other Qt classes. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <private/qt3dcore_global_p.h> +#include <private/qscenechange_p.h> + +QT_BEGIN_NAMESPACE + +namespace Qt3DCore { + +class QT3DCORE_PRIVATE_EXPORT QNodeCommandPrivate : public QSceneChangePrivate +{ +public: + QNodeCommandPrivate(); + + static QNodeCommand::CommandId createId(); + + QNodeCommand::CommandId m_commandId; + QNodeCommand::CommandId m_replyToCommandId; + QString m_name; + QVariant m_data; +}; + +} // namespace Qt3DCore + +QT_END_NAMESPACE + +#endif // QT3DCORE_QNODECOMMAND_P_H diff --git a/src/core/changes/qnodecreatedchange.cpp b/src/core/changes/qnodecreatedchange.cpp index a77721cdc..34ca939d7 100644 --- a/src/core/changes/qnodecreatedchange.cpp +++ b/src/core/changes/qnodecreatedchange.cpp @@ -36,7 +36,9 @@ #include "qnodecreatedchange.h" #include "qnodecreatedchange_p.h" + #include <Qt3DCore/qnode.h> + #include <Qt3DCore/private/qnode_p.h> QT_BEGIN_NAMESPACE diff --git a/src/core/changes/qnodecreatedchange.h b/src/core/changes/qnodecreatedchange.h index 4b5e70b82..85444e00c 100644 --- a/src/core/changes/qnodecreatedchange.h +++ b/src/core/changes/qnodecreatedchange.h @@ -37,9 +37,8 @@ #ifndef QT3DCORE_QNODECREATEDCHANGE_H #define QT3DCORE_QNODECREATEDCHANGE_H -#include <Qt3DCore/qt3dcore_global.h> #include <Qt3DCore/qscenechange.h> - +#include <Qt3DCore/qt3dcore_global.h> #include <QtCore/qsharedpointer.h> QT_BEGIN_NAMESPACE diff --git a/src/core/changes/qnodecreatedchange_p.h b/src/core/changes/qnodecreatedchange_p.h index 75969e461..cb1470970 100644 --- a/src/core/changes/qnodecreatedchange_p.h +++ b/src/core/changes/qnodecreatedchange_p.h @@ -48,10 +48,11 @@ // We mean it. // -#include <Qt3DCore/private/qt3dcore_global_p.h> -#include <private/qscenechange_p.h> #include <Qt3DCore/qnodeid.h> +#include <Qt3DCore/private/qscenechange_p.h> +#include <Qt3DCore/private/qt3dcore_global_p.h> + struct QMetaObject; QT_BEGIN_NAMESPACE diff --git a/src/core/changes/qnodedestroyedchange.h b/src/core/changes/qnodedestroyedchange.h index 348fda23f..11a54f8e2 100644 --- a/src/core/changes/qnodedestroyedchange.h +++ b/src/core/changes/qnodedestroyedchange.h @@ -37,8 +37,8 @@ #ifndef QT3DCORE_QNODEDESTROYEDCHANGE_H #define QT3DCORE_QNODEDESTROYEDCHANGE_H -#include <Qt3DCore/qscenechange.h> #include <Qt3DCore/qnode.h> +#include <Qt3DCore/qscenechange.h> #include <QtCore/qsharedpointer.h> QT_BEGIN_NAMESPACE diff --git a/src/core/changes/qnodedestroyedchange_p.h b/src/core/changes/qnodedestroyedchange_p.h index 999976431..081ca858f 100644 --- a/src/core/changes/qnodedestroyedchange_p.h +++ b/src/core/changes/qnodedestroyedchange_p.h @@ -48,9 +48,10 @@ // We mean it. // -#include <private/qscenechange_p.h> #include <Qt3DCore/qnode.h> +#include <Qt3DCore/private/qscenechange_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DCore { diff --git a/src/core/changes/qpropertynodeaddedchange.cpp b/src/core/changes/qpropertynodeaddedchange.cpp index 66b5c70d3..390a170b6 100644 --- a/src/core/changes/qpropertynodeaddedchange.cpp +++ b/src/core/changes/qpropertynodeaddedchange.cpp @@ -39,6 +39,7 @@ #include "qpropertynodeaddedchange.h" #include "qpropertynodeaddedchange_p.h" + #include <Qt3DCore/private/qnode_p.h> QT_BEGIN_NAMESPACE diff --git a/src/core/changes/qpropertynodeaddedchange_p.h b/src/core/changes/qpropertynodeaddedchange_p.h index 01340ae8c..2930867ea 100644 --- a/src/core/changes/qpropertynodeaddedchange_p.h +++ b/src/core/changes/qpropertynodeaddedchange_p.h @@ -51,9 +51,10 @@ // We mean it. // -#include <private/qstaticpropertyvalueaddedchangebase_p.h> #include <Qt3DCore/qnode.h> +#include <Qt3DCore/private/qstaticpropertyvalueaddedchangebase_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DCore { diff --git a/src/core/changes/qpropertynoderemovedchange.cpp b/src/core/changes/qpropertynoderemovedchange.cpp index a7b4e95f3..a0f342d0b 100644 --- a/src/core/changes/qpropertynoderemovedchange.cpp +++ b/src/core/changes/qpropertynoderemovedchange.cpp @@ -39,6 +39,7 @@ #include "qpropertynoderemovedchange.h" #include "qpropertynoderemovedchange_p.h" + #include <Qt3DCore/private/qnode_p.h> QT_BEGIN_NAMESPACE diff --git a/src/core/changes/qpropertynoderemovedchange_p.h b/src/core/changes/qpropertynoderemovedchange_p.h index 6cd23661b..0145cc507 100644 --- a/src/core/changes/qpropertynoderemovedchange_p.h +++ b/src/core/changes/qpropertynoderemovedchange_p.h @@ -51,9 +51,10 @@ // We mean it. // -#include <private/qstaticpropertyvalueremovedchangebase_p.h> #include <Qt3DCore/qnode.h> +#include <Qt3DCore/private/qstaticpropertyvalueremovedchangebase_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DCore { diff --git a/src/core/changes/qpropertyupdatedchange_p.h b/src/core/changes/qpropertyupdatedchange_p.h index f985120c9..ad908a8c4 100644 --- a/src/core/changes/qpropertyupdatedchange_p.h +++ b/src/core/changes/qpropertyupdatedchange_p.h @@ -51,8 +51,9 @@ // We mean it. // -#include <private/qstaticpropertyupdatedchangebase_p.h> -#include <QVariant> +#include <QtCore/QVariant> + +#include <Qt3DCore/private/qstaticpropertyupdatedchangebase_p.h> QT_BEGIN_NAMESPACE diff --git a/src/core/changes/qpropertyupdatedchangebase.cpp b/src/core/changes/qpropertyupdatedchangebase.cpp index d33c737e5..5d79b9049 100644 --- a/src/core/changes/qpropertyupdatedchangebase.cpp +++ b/src/core/changes/qpropertyupdatedchangebase.cpp @@ -46,7 +46,7 @@ namespace Qt3DCore { QPropertyUpdatedChangeBasePrivate::QPropertyUpdatedChangeBasePrivate() : QSceneChangePrivate() - , m_isFinal(false) + , m_isIntermediate(false) { } diff --git a/src/core/changes/qpropertyupdatedchangebase_p.h b/src/core/changes/qpropertyupdatedchangebase_p.h index 3c32b2237..7c66812a1 100644 --- a/src/core/changes/qpropertyupdatedchangebase_p.h +++ b/src/core/changes/qpropertyupdatedchangebase_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <private/qscenechange_p.h> +#include <Qt3DCore/private/qscenechange_p.h> #include <Qt3DCore/private/qt3dcore_global_p.h> QT_BEGIN_NAMESPACE @@ -69,7 +69,12 @@ public: static QPropertyUpdatedChangeBasePrivate *get(QPropertyUpdatedChangeBase *q); Q_DECLARE_PUBLIC(QPropertyUpdatedChangeBase) - bool m_isFinal; + + // Frontend nodes should not receive intermediate animated property + // updated by default. Only if they subscribe. The animation aspect + // will set this to true for animating properties apart from the final + // frame's update. + bool m_isIntermediate; }; } // namespace Qt3DCore diff --git a/src/core/changes/qpropertyvalueaddedchange_p.h b/src/core/changes/qpropertyvalueaddedchange_p.h index 538a591a1..edd59489f 100644 --- a/src/core/changes/qpropertyvalueaddedchange_p.h +++ b/src/core/changes/qpropertyvalueaddedchange_p.h @@ -51,10 +51,11 @@ // We mean it. // -#include <private/qstaticpropertyvalueaddedchangebase_p.h> -#include <Qt3DCore/private/qt3dcore_global_p.h> #include <QtCore/qvariant.h> +#include <Qt3DCore/private/qstaticpropertyvalueaddedchangebase_p.h> +#include <Qt3DCore/private/qt3dcore_global_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DCore { diff --git a/src/core/changes/qpropertyvalueaddedchangebase.cpp b/src/core/changes/qpropertyvalueaddedchangebase.cpp index 26dcd5555..3c9929496 100644 --- a/src/core/changes/qpropertyvalueaddedchangebase.cpp +++ b/src/core/changes/qpropertyvalueaddedchangebase.cpp @@ -38,6 +38,7 @@ ****************************************************************************/ #include "qpropertyvalueaddedchangebase.h" + #include "qpropertyvalueaddedchangebase_p.h" QT_BEGIN_NAMESPACE diff --git a/src/core/changes/qpropertyvalueaddedchangebase_p.h b/src/core/changes/qpropertyvalueaddedchangebase_p.h index 405b2ad3f..be92e2d5b 100644 --- a/src/core/changes/qpropertyvalueaddedchangebase_p.h +++ b/src/core/changes/qpropertyvalueaddedchangebase_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <private/qscenechange_p.h> +#include <Qt3DCore/private/qscenechange_p.h> #include <Qt3DCore/private/qt3dcore_global_p.h> QT_BEGIN_NAMESPACE diff --git a/src/core/changes/qpropertyvalueremovedchange.cpp b/src/core/changes/qpropertyvalueremovedchange.cpp index 6e8a1f817..9d420abc0 100644 --- a/src/core/changes/qpropertyvalueremovedchange.cpp +++ b/src/core/changes/qpropertyvalueremovedchange.cpp @@ -38,6 +38,7 @@ ****************************************************************************/ #include "qpropertyvalueremovedchange.h" + #include "qpropertyvalueremovedchange_p.h" QT_BEGIN_NAMESPACE diff --git a/src/core/changes/qpropertyvalueremovedchange_p.h b/src/core/changes/qpropertyvalueremovedchange_p.h index 82644b76c..b4e86bc9e 100644 --- a/src/core/changes/qpropertyvalueremovedchange_p.h +++ b/src/core/changes/qpropertyvalueremovedchange_p.h @@ -51,10 +51,11 @@ // We mean it. // -#include <private/qstaticpropertyvalueremovedchangebase_p.h> -#include <Qt3DCore/private/qt3dcore_global_p.h> #include <QtCore/qvariant.h> +#include <Qt3DCore/private/qstaticpropertyvalueremovedchangebase_p.h> +#include <Qt3DCore/private/qt3dcore_global_p.h> + QT_BEGIN_NAMESPACE namespace Qt3DCore { diff --git a/src/core/changes/qpropertyvalueremovedchangebase.cpp b/src/core/changes/qpropertyvalueremovedchangebase.cpp index 8115d6e22..71213019c 100644 --- a/src/core/changes/qpropertyvalueremovedchangebase.cpp +++ b/src/core/changes/qpropertyvalueremovedchangebase.cpp @@ -38,6 +38,7 @@ ****************************************************************************/ #include "qpropertyvalueremovedchangebase.h" + #include "qpropertyvalueremovedchangebase_p.h" QT_BEGIN_NAMESPACE diff --git a/src/core/changes/qpropertyvalueremovedchangebase_p.h b/src/core/changes/qpropertyvalueremovedchangebase_p.h index e4c4be640..f9c1b4009 100644 --- a/src/core/changes/qpropertyvalueremovedchangebase_p.h +++ b/src/core/changes/qpropertyvalueremovedchangebase_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <private/qscenechange_p.h> +#include <Qt3DCore/private/qscenechange_p.h> #include <Qt3DCore/private/qt3dcore_global_p.h> QT_BEGIN_NAMESPACE diff --git a/src/core/changes/qscenechange.cpp b/src/core/changes/qscenechange.cpp index 959518904..df15e239d 100644 --- a/src/core/changes/qscenechange.cpp +++ b/src/core/changes/qscenechange.cpp @@ -38,6 +38,7 @@ ****************************************************************************/ #include "qscenechange.h" + #include "qscenechange_p.h" QT_BEGIN_NAMESPACE diff --git a/src/core/changes/qscenechange.h b/src/core/changes/qscenechange.h index 4555983e2..854bab051 100644 --- a/src/core/changes/qscenechange.h +++ b/src/core/changes/qscenechange.h @@ -40,9 +40,9 @@ #ifndef QT3DCORE_QSCENECHANGE_H #define QT3DCORE_QSCENECHANGE_H -#include <Qt3DCore/qt3dcore_global.h> -#include <QSharedPointer> #include <Qt3DCore/qnodeid.h> +#include <Qt3DCore/qt3dcore_global.h> +#include <QtCore/QSharedPointer> QT_BEGIN_NAMESPACE @@ -56,6 +56,7 @@ enum ChangeFlag { PropertyValueRemoved = 1 << 4, ComponentAdded = 1 << 5, ComponentRemoved = 1 << 6, + CommandRequested = 1 << 7, AllChanges = 0xFFFFFFFF }; Q_DECLARE_FLAGS(ChangeFlags, ChangeFlag) diff --git a/src/core/changes/qscenechange_p.h b/src/core/changes/qscenechange_p.h index 80ce4eaa5..cd0194b01 100644 --- a/src/core/changes/qscenechange_p.h +++ b/src/core/changes/qscenechange_p.h @@ -51,9 +51,10 @@ // We mean it. // -#include <QtGlobal> -#include <Qt3DCore/private/qt3dcore_global_p.h> #include <Qt3DCore/qscenechange.h> +#include <QtCore/QtGlobal> + +#include <Qt3DCore/private/qt3dcore_global_p.h> QT_BEGIN_NAMESPACE diff --git a/src/core/changes/qstaticpropertyupdatedchangebase.cpp b/src/core/changes/qstaticpropertyupdatedchangebase.cpp index 409d80add..d065dbf0b 100644 --- a/src/core/changes/qstaticpropertyupdatedchangebase.cpp +++ b/src/core/changes/qstaticpropertyupdatedchangebase.cpp @@ -38,6 +38,7 @@ ****************************************************************************/ #include "qstaticpropertyupdatedchangebase.h" + #include "qstaticpropertyupdatedchangebase_p.h" QT_BEGIN_NAMESPACE diff --git a/src/core/changes/qstaticpropertyupdatedchangebase_p.h b/src/core/changes/qstaticpropertyupdatedchangebase_p.h index c81df4076..3f76e2f56 100644 --- a/src/core/changes/qstaticpropertyupdatedchangebase_p.h +++ b/src/core/changes/qstaticpropertyupdatedchangebase_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <private/qpropertyupdatedchangebase_p.h> +#include <Qt3DCore/private/qpropertyupdatedchangebase_p.h> QT_BEGIN_NAMESPACE diff --git a/src/core/changes/qstaticpropertyvalueaddedchangebase.cpp b/src/core/changes/qstaticpropertyvalueaddedchangebase.cpp index 4fb658459..efd2c0165 100644 --- a/src/core/changes/qstaticpropertyvalueaddedchangebase.cpp +++ b/src/core/changes/qstaticpropertyvalueaddedchangebase.cpp @@ -38,6 +38,7 @@ ****************************************************************************/ #include "qstaticpropertyvalueaddedchangebase.h" + #include "qstaticpropertyvalueaddedchangebase_p.h" QT_BEGIN_NAMESPACE diff --git a/src/core/changes/qstaticpropertyvalueaddedchangebase_p.h b/src/core/changes/qstaticpropertyvalueaddedchangebase_p.h index 7a614c0d1..cd995d739 100644 --- a/src/core/changes/qstaticpropertyvalueaddedchangebase_p.h +++ b/src/core/changes/qstaticpropertyvalueaddedchangebase_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <private/qpropertyvalueaddedchangebase_p.h> +#include <Qt3DCore/private/qpropertyvalueaddedchangebase_p.h> #include <Qt3DCore/private/qt3dcore_global_p.h> QT_BEGIN_NAMESPACE diff --git a/src/core/changes/qstaticpropertyvalueremovedchangebase_p.h b/src/core/changes/qstaticpropertyvalueremovedchangebase_p.h index 47f43f745..ac4e1d875 100644 --- a/src/core/changes/qstaticpropertyvalueremovedchangebase_p.h +++ b/src/core/changes/qstaticpropertyvalueremovedchangebase_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <private/qpropertyvalueremovedchangebase_p.h> +#include <Qt3DCore/private/qpropertyvalueremovedchangebase_p.h> #include <Qt3DCore/private/qt3dcore_global_p.h> QT_BEGIN_NAMESPACE |