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

1 files changed, 12 insertions, 17 deletions

diff --git a/src/designer/src/designer/qdesigner_toolwindow.h b/src/designer/src/designer/qdesigner_toolwindow.h
index 351a5e289..741e8a6bd 100644
--- a/src/designer/src/designer/qdesigner_toolwindow.h
+++ b/src/designer/src/designer/qdesigner_toolwindow.h
@@ -1,31 +1,26 @@
 /****************************************************************************
 **
-** 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 Qt Designer of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
 ** 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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **