1 files changed, 47 insertions, 27 deletions

diff --git a/src/quick/scenegraph/qsgadaptationlayer.cpp b/src/quick/scenegraph/qsgadaptationlayer.cpp
index ee077dbaf1..faf2762acc 100644
--- a/src/quick/scenegraph/qsgadaptationlayer.cpp
+++ b/src/quick/scenegraph/qsgadaptationlayer.cpp
@@ -1,40 +1,32 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtQuick module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL$
+** $QT_BEGIN_LICENSE:LGPL21$
 ** 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 Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
 ** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
+** rights. These rights are described in the Digia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 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 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -297,22 +289,22 @@ void QSGNodeVisitorEx::visitChildren(QSGNode *node)
         switch (child->type()) {
         case QSGNode::ClipNodeType: {
             QSGClipNode *c = static_cast<QSGClipNode*>(child);
-            visit(c);
-            visitChildren(c);
+            if (visit(c))
+                visitChildren(c);
             endVisit(c);
             break;
         }
         case QSGNode::TransformNodeType: {
             QSGTransformNode *c = static_cast<QSGTransformNode*>(child);
-            visit(c);
-            visitChildren(c);
+            if (visit(c))
+                visitChildren(c);
             endVisit(c);
             break;
         }
         case QSGNode::OpacityNodeType: {
             QSGOpacityNode *c = static_cast<QSGOpacityNode*>(child);
-            visit(c);
-            visitChildren(c);
+            if (visit(c))
+                visitChildren(c);
             endVisit(c);
             break;
         }
@@ -322,12 +314,19 @@ void QSGNodeVisitorEx::visitChildren(QSGNode *node)
                 v->accept(this);
             } else {
                 QSGGeometryNode *c = static_cast<QSGGeometryNode*>(child);
-                visit(c);
-                visitChildren(c);
+                if (visit(c))
+                    visitChildren(c);
                 endVisit(c);
             }
             break;
         }
+        case QSGNode::RootNodeType: {
+            QSGRootNode *root = static_cast<QSGRootNode*>(child);
+            if (visit(root))
+                visitChildren(root);
+            endVisit(root);
+            break;
+        }
         case QSGNode::BasicNodeType: {
             visitChildren(child);
             break;
@@ -339,4 +338,25 @@ void QSGNodeVisitorEx::visitChildren(QSGNode *node)
     }
 }
 
+void QSGLayer::markDirtyTextureLater()
+{
+    QCoreApplication::postEvent(this, new QEvent(static_cast<QEvent::Type>(markDirtyEventType())));
+}
+
+void QSGLayer::customEvent(QEvent *event)
+{
+    if (event->type() == markDirtyEventType())
+        markDirtyTexture();
+    else
+        QObject::customEvent(event);
+}
+
+int QSGLayer::markDirtyEventType()
+{
+    static int type = QEvent::None;
+    if (type == QEvent::None)
+        type = QEvent::registerEventType();
+    return type;
+}
+
 QT_END_NAMESPACE