diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-30 13:32:55 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-30 13:32:55 +0200 |
| commit | 0496e7f73afa69cadb3742b7423b2c8ae3665c13 (patch) | |
| tree | 908065953aff1eca667b3b075de254df68420e73 /examples/assistant/remotecontrol/remotecontrol.h | |
| parent | 2ec8a7baff14f476322ca96830c844a9d05b7b6d (diff) | |
| parent | 3b1da8a7754b37d5767aeb55a7ca46e4180a6109 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/assistant/qcollectiongenerator/main.cpp
src/qtestlib/wince/cetcpsync/main.cpp
src/qtestlib/wince/cetcpsync/qtcesterconnection.cpp
src/qtestlib/wince/cetcpsync/qtcesterconnection.h
src/qtestlib/wince/cetcpsync/remoteconnection.cpp
src/qtestlib/wince/cetcpsync/remoteconnection.h
src/qtestlib/wince/cetcpsyncserver/commands.cpp
src/qtestlib/wince/cetcpsyncserver/commands.h
src/qtestlib/wince/cetcpsyncserver/connectionmanager.cpp
src/qtestlib/wince/cetcpsyncserver/connectionmanager.h
src/qtestlib/wince/cetcpsyncserver/main.cpp
src/qtestlib/wince/cetcpsyncserver/transfer_global.h
src/qtestlib/wince/cetest/activesyncconnection.cpp
src/qtestlib/wince/cetest/activesyncconnection.h
src/qtestlib/wince/cetest/cetcpsyncconnection.cpp
src/qtestlib/wince/cetest/cetcpsyncconnection.h
src/qtestlib/wince/cetest/deployment.cpp
src/qtestlib/wince/cetest/deployment.h
src/qtestlib/wince/cetest/main.cpp
src/qtestlib/wince/cetest/remoteconnection.cpp
src/qtestlib/wince/cetest/remoteconnection.h
src/qtestlib/wince/remotelib/commands.cpp
src/qtestlib/wince/remotelib/commands.h
Change-Id: Ia1b311710f7e8009ca1697faae3ae5e37e80ecc3
Diffstat (limited to 'examples/assistant/remotecontrol/remotecontrol.h')
| -rw-r--r-- | examples/assistant/remotecontrol/remotecontrol.h | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/examples/assistant/remotecontrol/remotecontrol.h b/examples/assistant/remotecontrol/remotecontrol.h index fbb2856ce..16a9f9441 100644 --- a/examples/assistant/remotecontrol/remotecontrol.h +++ b/examples/assistant/remotecontrol/remotecontrol.h @@ -1,12 +1,22 @@ /**************************************************************************** ** -** 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 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 |