aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/scenegraph/softwarecontext/renderingvisitor.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/scenegraph/softwarecontext/renderingvisitor.cpp')
-rw-r--r--src/plugins/scenegraph/softwarecontext/renderingvisitor.cpp28
1 files changed, 18 insertions, 10 deletions
diff --git a/src/plugins/scenegraph/softwarecontext/renderingvisitor.cpp b/src/plugins/scenegraph/softwarecontext/renderingvisitor.cpp
index 9be4145db2..04ec3318ed 100644
--- a/src/plugins/scenegraph/softwarecontext/renderingvisitor.cpp
+++ b/src/plugins/scenegraph/softwarecontext/renderingvisitor.cpp
@@ -1,23 +1,31 @@
-/******************************************************************************
+/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
-** This file is part of the Qt Quick 2d Renderer module.
-**
-** $QT_BEGIN_LICENSE:COMM$
+** This file is part of the Qt Quick 2D Renderer module of the Qt Toolkit.
**
+** $QT_BEGIN_LICENSE:GPL$
** 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 or (at your option) 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.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-3.0.html.
**
** $QT_END_LICENSE$
**
-******************************************************************************/
+****************************************************************************/
#include "renderingvisitor.h"
@@ -66,7 +74,7 @@ void RenderingVisitor::endVisit(QSGClipNode *)
bool RenderingVisitor::visit(QSGGeometryNode *node)
{
if (QSGSimpleRectNode *rectNode = dynamic_cast<QSGSimpleRectNode *>(node)) {
- if (!rectNode->material()->flags() & QSGMaterial::Blending)
+ if (!(rectNode->material()->flags() & QSGMaterial::Blending))
painter->setCompositionMode(QPainter::CompositionMode_Source);
painter->fillRect(rectNode->rect(), rectNode->color());
painter->setCompositionMode(QPainter::CompositionMode_SourceOver);