diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2017-10-27 10:37:21 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2017-10-27 10:37:21 +0200 |
| commit | 62293cefae129bbfebb0317b39d059b0abb1a16a (patch) | |
| tree | 159080c98a85baa02e34776cf2618642ae55d456 /config.tests/libhybris_egl_server/main.cpp | |
| parent | c2b272ac73617a8d5ff25151534feda95ace63ee (diff) | |
| parent | 523cf490b4c46916c6f5253c666a492f5cce2aad (diff) | |
Merge remote-tracking branch 'qt/5.10' into dev
Change-Id: I4f885a551093ada07da97fd3d99902e36f98595e
Diffstat (limited to 'config.tests/libhybris_egl_server/main.cpp')
| -rw-r--r-- | config.tests/libhybris_egl_server/main.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/config.tests/libhybris_egl_server/main.cpp b/config.tests/libhybris_egl_server/main.cpp index 294889572..368b57a12 100644 --- a/config.tests/libhybris_egl_server/main.cpp +++ b/config.tests/libhybris_egl_server/main.cpp @@ -1,12 +1,22 @@ /**************************************************************************** ** ** Copyright (C) 2014 Jolla Ltd, author: <giulio.camuffo@jollamobile.com> -** Contact: http://www.qt.io/licensing/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Compositor. ** ** $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 |