summaryrefslogtreecommitdiff
path: root/examples/svg/svgviewer/svgview.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-10-30 08:45:56 +0100
committerLiang Qi <liang.qi@qt.io>2017-10-30 09:34:15 +0100
commit5f4e02ca605f640beed9eebe74182814795e087e (patch)
tree32c74e15e9bd2fcca52427314c73f35b900cabf7 /examples/svg/svgviewer/svgview.cpp
parentdc9e39eb679946e82bf3b1a82f5c49737f9994b2 (diff)
parentc4c9b60dc4bbe3c3837c80ea63682f3ef9403277 (diff)
downloadqtsvg-5f4e02ca605f640beed9eebe74182814795e087e.tar.gz
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts: .qmake.conf Change-Id: I8b9a5a395dbd6659f7806eeebdd665c760a71ec1
Diffstat (limited to 'examples/svg/svgviewer/svgview.cpp')
-rw-r--r--examples/svg/svgviewer/svgview.cpp16
1 files changed, 13 insertions, 3 deletions
diff --git a/examples/svg/svgviewer/svgview.cpp b/examples/svg/svgviewer/svgview.cpp
index cbea85d..bbc853c 100644
--- a/examples/svg/svgviewer/svgview.cpp
+++ b/examples/svg/svgviewer/svgview.cpp
@@ -1,12 +1,22 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** 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.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are