diff options
| author | Andy Nichols <andy.nichols@theqtcompany.com> | 2015-10-15 15:51:19 +0200 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@theqtcompany.com> | 2015-10-15 15:52:00 +0200 |
| commit | 90fd671857c303d7dafe0e1717cae765acb67fbc (patch) | |
| tree | 018a921c84b949b9349db174268e5ab6ee8c16a3 /src/plugins/scenegraph/softwarecontext/imagenode.cpp | |
| parent | 6b794223f2ce4349044ae13337f31a249cc2c173 (diff) | |
| parent | 5aa0efd86a5379bd51c7a1195fd5c5d36f94dfda (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: Id464e8d37bd1130204c823f23149d15deaf7618e
Diffstat (limited to 'src/plugins/scenegraph/softwarecontext/imagenode.cpp')
| -rw-r--r-- | src/plugins/scenegraph/softwarecontext/imagenode.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/scenegraph/softwarecontext/imagenode.cpp b/src/plugins/scenegraph/softwarecontext/imagenode.cpp index 0ca579db5b..b5b0dbc5cf 100644 --- a/src/plugins/scenegraph/softwarecontext/imagenode.cpp +++ b/src/plugins/scenegraph/softwarecontext/imagenode.cpp @@ -1,22 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc -** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt SceneGraph Raster Add-on. +** This file is part of Qt Quick 2d Renderer module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the +** 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. -** -** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com +** 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. ** $QT_END_LICENSE$ ** ****************************************************************************/ + #include "imagenode.h" #include "pixmaptexture.h" |