Merge remote-tracking branch 'origin/5.13' into dev

 Conflicts:
	src/render/renderers/opengl/renderer/renderer.cpp
	tests/auto/render/textures/tst_textures.cpp

Change-Id: I4da0eafe7ddd4dd822c3dcb5f5fa826653a335b4

1 files changed, 95 insertions, 0 deletions

diff --git a/src/render/backend/entityvisitor_p.h b/src/render/backend/entityvisitor_p.h
new file mode 100644
index 000000000..2f4f1c813
--- /dev/null
+++ b/src/render/backend/entityvisitor_p.h
@@ -0,0 +1,95 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 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: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$
+**
+****************************************************************************/
+
+#ifndef QT3DRENDER_RENDER_ENTITYVISITOR_H
+#define QT3DRENDER_RENDER_ENTITYVISITOR_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 <qglobal.h>
+
+QT_BEGIN_NAMESPACE
+
+namespace Qt3DRender {
+namespace Render {
+
+class Entity;
+class NodeManagers;
+
+class Q_AUTOTEST_EXPORT EntityVisitor
+{
+public:
+    enum Operation {
+        Continue,   //! continue traversal
+        Prune,      //! don't traverse children
+        Stop        //! abort traversal
+    };
+
+    EntityVisitor(NodeManagers *manager);
+    virtual ~EntityVisitor();
+
+    virtual Operation visit(Entity *entity = nullptr);
+
+    bool pruneDisabled() const;
+    void setPruneDisabled(bool pruneDisabled);
+
+    bool apply(Entity *root);
+
+protected:
+    NodeManagers *m_manager;
+
+private:
+    bool m_pruneDisabled;
+};
+
+} // namespace Render
+} // namespace Qt3DRender
+
+QT_END_NAMESPACE
+
+#endif // QT3DRENDER_RENDER_ENTITYVISITOR_H