diff options
author | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:42:18 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-10-31 09:19:01 +0100 |
commit | 4c32d8f66280b8db9256f199afb2bae6b92ad7a5 (patch) | |
tree | 81d6ad319b4d48faba7f829054d1ef113ff465d4 /examples/qt3d | |
parent | ced895b361e4fff97f1b2d21e7f1bb33c82f34cd (diff) | |
parent | 294eefef0f8cfdba2edd73b5bd2ba7435b102ce5 (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
src/render/backend/renderview.cpp
src/render/backend/renderview_p.h
Change-Id: I6c1122632f2c481da31a63e3abd42b760d1ff211
Diffstat (limited to 'examples/qt3d')
-rw-r--r-- | examples/qt3d/widgets-scene3d/main.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/examples/qt3d/widgets-scene3d/main.cpp b/examples/qt3d/widgets-scene3d/main.cpp index d306ed7b8..38eb46833 100644 --- a/examples/qt3d/widgets-scene3d/main.cpp +++ b/examples/qt3d/widgets-scene3d/main.cpp @@ -1,12 +1,22 @@ /**************************************************************************** ** ** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** 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 |