Update License according to agreement with Free Qt Foundation

* Update all files in share folder Change-Id: I8a82c3eb2eb614d4339dd4c4e690f54b5f29d813 Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-01-15 14:59:14 +01:00
parent 954569387c
commit 38cce7eb83
269 changed files with 2861 additions and 3022 deletions
--- a/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore/qobjectdefs.h
+++ b/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore/qobjectdefs.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,22 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
-** GNU Lesser General Public License Usage
+** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
+** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.1 or version 3 as published by the Free
+** General Public License version 3 as published by the Free Software
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
+** included in the packaging of this file. Please review the following
-** following information to ensure the GNU Lesser General Public License
+** information to ensure the GNU General Public License requirements will
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, 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.
 **
 ****************************************************************************/
--- a/share/qtcreator/glsl/glsl_120.frag
+++ b/share/qtcreator/glsl/glsl_120.frag
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,22 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
-** GNU Lesser General Public License Usage
+** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
+** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.1 or version 3 as published by the Free
+** General Public License version 3 as published by the Free Software
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
+** included in the packaging of this file. Please review the following
-** following information to ensure the GNU Lesser General Public License
+** information to ensure the GNU General Public License requirements will
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, 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.
 **
 ****************************************************************************/
--- a/share/qtcreator/glsl/glsl_120.vert
+++ b/share/qtcreator/glsl/glsl_120.vert
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,22 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
-** GNU Lesser General Public License Usage
+** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
+** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.1 or version 3 as published by the Free
+** General Public License version 3 as published by the Free Software
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
+** included in the packaging of this file. Please review the following
-** following information to ensure the GNU Lesser General Public License
+** information to ensure the GNU General Public License requirements will
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, 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.
 **
 ****************************************************************************/
--- a/share/qtcreator/glsl/glsl_120_common.glsl
+++ b/share/qtcreator/glsl/glsl_120_common.glsl
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,22 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
-** GNU Lesser General Public License Usage
+** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
+** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.1 or version 3 as published by the Free
+** General Public License version 3 as published by the Free Software
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
+** included in the packaging of this file. Please review the following
-** following information to ensure the GNU Lesser General Public License
+** information to ensure the GNU General Public License requirements will
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, 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.
 **
 ****************************************************************************/
--- a/share/qtcreator/glsl/glsl_es_100.frag
+++ b/share/qtcreator/glsl/glsl_es_100.frag
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,22 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
-** GNU Lesser General Public License Usage
+** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
+** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.1 or version 3 as published by the Free
+** General Public License version 3 as published by the Free Software
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
+** included in the packaging of this file. Please review the following
-** following information to ensure the GNU Lesser General Public License
+** information to ensure the GNU General Public License requirements will
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, 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.
 **
 ****************************************************************************/
--- a/share/qtcreator/glsl/glsl_es_100.vert
+++ b/share/qtcreator/glsl/glsl_es_100.vert
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,22 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
-** GNU Lesser General Public License Usage
+** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
+** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.1 or version 3 as published by the Free
+** General Public License version 3 as published by the Free Software
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
+** included in the packaging of this file. Please review the following
-** following information to ensure the GNU Lesser General Public License
+** information to ensure the GNU General Public License requirements will
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, 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.
 **
 ****************************************************************************/
--- a/share/qtcreator/glsl/glsl_es_100_common.glsl
+++ b/share/qtcreator/glsl/glsl_es_100_common.glsl
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,22 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
-** GNU Lesser General Public License Usage
+** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
+** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.1 or version 3 as published by the Free
+** General Public License version 3 as published by the Free Software
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
+** included in the packaging of this file. Please review the following
-** following information to ensure the GNU Lesser General Public License
+** information to ensure the GNU General Public License requirements will
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, 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.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmldump/Info.plist.in
+++ b/share/qtcreator/qml/qmldump/Info.plist.in
@@ -3,14 +3,13 @@
 <plist version=\"1.0\">
 <dict>
        <key>NSHumanReadableCopyright</key>
-        <string>(C) 2015 The Qt Company Ltd
+        <string>(C) 2016 The Qt Company Ltd
-Commercial Usage
+Commercial License Usage
-Licensees holding valid Qt Commercial licenses may use this file in accordance with the Qt 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.
+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.
-GNU Lesser General Public License Usage
+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.</string>
 Alternatively, this plugin 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.</string>
        <key>CFBundlePackageType</key>
        <string>APPL</string>
        <key>CFBundleSignature</key>
--- a/share/qtcreator/qml/qmldump/main.cpp
+++ b/share/qtcreator/qml/qmldump/main.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,22 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
-** GNU Lesser General Public License Usage
+** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
+** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.1 or version 3 as published by the Free
+** General Public License version 3 as published by the Free Software
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
+** included in the packaging of this file. Please review the following
-** following information to ensure the GNU Lesser General Public License
+** information to ensure the GNU General Public License requirements will
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, 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.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmldump/qmlstreamwriter.cpp
+++ b/share/qtcreator/qml/qmldump/qmlstreamwriter.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,22 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
-** GNU Lesser General Public License Usage
+** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
+** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.1 or version 3 as published by the Free
+** General Public License version 3 as published by the Free Software
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
+** included in the packaging of this file. Please review the following
-** following information to ensure the GNU Lesser General Public License
+** information to ensure the GNU General Public License requirements will
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, 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.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmldump/qmlstreamwriter.h
+++ b/share/qtcreator/qml/qmldump/qmlstreamwriter.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,22 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
-** GNU Lesser General Public License Usage
+** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
+** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.1 or version 3 as published by the Free
+** General Public License version 3 as published by the Free Software
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
+** included in the packaging of this file. Please review the following
-** following information to ensure the GNU Lesser General Public License
+** information to ensure the GNU General Public License requirements will
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, 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.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/changeauxiliarycommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/changeauxiliarycommand.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/changeauxiliarycommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/changeauxiliarycommand.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/changebindingscommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/changebindingscommand.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/changebindingscommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/changebindingscommand.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/changefileurlcommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/changefileurlcommand.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/changefileurlcommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/changefileurlcommand.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/changeidscommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/changeidscommand.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/changeidscommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/changeidscommand.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/changestatecommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/changestatecommand.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/changestatecommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/changestatecommand.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/changevaluescommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/changevaluescommand.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/changevaluescommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/changevaluescommand.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/childrenchangedcommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/childrenchangedcommand.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/childrenchangedcommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/childrenchangedcommand.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/clearscenecommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/clearscenecommand.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/clearscenecommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/clearscenecommand.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/completecomponentcommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/completecomponentcommand.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/completecomponentcommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/completecomponentcommand.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/componentcompletedcommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/componentcompletedcommand.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/componentcompletedcommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/componentcompletedcommand.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/createinstancescommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/createinstancescommand.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/createinstancescommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/createinstancescommand.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/createscenecommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/createscenecommand.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/createscenecommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/createscenecommand.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/debugoutputcommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/debugoutputcommand.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,21 +9,20 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
 #include "debugoutputcommand.h"
 #include <QtDebug>
--- a/share/qtcreator/qml/qmlpuppet/commands/debugoutputcommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/debugoutputcommand.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,19 +9,20 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
 #ifndef QMLDESIGNER_ENDPUPPETCOMMAND_H
 #define QMLDESIGNER_ENDPUPPETCOMMAND_H
--- a/share/qtcreator/qml/qmlpuppet/commands/informationchangedcommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/informationchangedcommand.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/informationchangedcommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/informationchangedcommand.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/pixmapchangedcommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/pixmapchangedcommand.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/pixmapchangedcommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/pixmapchangedcommand.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/puppetalivecommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/puppetalivecommand.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/puppetalivecommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/puppetalivecommand.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/removeinstancescommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/removeinstancescommand.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/removeinstancescommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/removeinstancescommand.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/removepropertiescommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/removepropertiescommand.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/removepropertiescommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/removepropertiescommand.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/removesharedmemorycommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/removesharedmemorycommand.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,21 +9,20 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
 #include "removesharedmemorycommand.h"
 #include <QDataStream>
--- a/share/qtcreator/qml/qmlpuppet/commands/removesharedmemorycommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/removesharedmemorycommand.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,21 +9,20 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
 #ifndef QMLDESIGNER_REMOVESHAREDMEMORYCOMMAND_H
 #define QMLDESIGNER_REMOVESHAREDMEMORYCOMMAND_H
--- a/share/qtcreator/qml/qmlpuppet/commands/reparentinstancescommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/reparentinstancescommand.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/reparentinstancescommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/reparentinstancescommand.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/statepreviewimagechangedcommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/statepreviewimagechangedcommand.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/statepreviewimagechangedcommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/statepreviewimagechangedcommand.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/synchronizecommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/synchronizecommand.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/synchronizecommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/synchronizecommand.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/tokencommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/tokencommand.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/tokencommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/tokencommand.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.cpp
+++ b/share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.h
+++ b/share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/container/addimportcontainer.cpp
+++ b/share/qtcreator/qml/qmlpuppet/container/addimportcontainer.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/container/addimportcontainer.h
+++ b/share/qtcreator/qml/qmlpuppet/container/addimportcontainer.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/container/idcontainer.cpp
+++ b/share/qtcreator/qml/qmlpuppet/container/idcontainer.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/container/idcontainer.h
+++ b/share/qtcreator/qml/qmlpuppet/container/idcontainer.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/container/imagecontainer.cpp
+++ b/share/qtcreator/qml/qmlpuppet/container/imagecontainer.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/container/imagecontainer.h
+++ b/share/qtcreator/qml/qmlpuppet/container/imagecontainer.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/container/informationcontainer.cpp
+++ b/share/qtcreator/qml/qmlpuppet/container/informationcontainer.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/container/informationcontainer.h
+++ b/share/qtcreator/qml/qmlpuppet/container/informationcontainer.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/container/instancecontainer.cpp
+++ b/share/qtcreator/qml/qmlpuppet/container/instancecontainer.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/container/instancecontainer.h
+++ b/share/qtcreator/qml/qmlpuppet/container/instancecontainer.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/container/propertyabstractcontainer.cpp
+++ b/share/qtcreator/qml/qmlpuppet/container/propertyabstractcontainer.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/container/propertyabstractcontainer.h
+++ b/share/qtcreator/qml/qmlpuppet/container/propertyabstractcontainer.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/container/propertybindingcontainer.cpp
+++ b/share/qtcreator/qml/qmlpuppet/container/propertybindingcontainer.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/container/propertybindingcontainer.h
+++ b/share/qtcreator/qml/qmlpuppet/container/propertybindingcontainer.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/container/propertyvaluecontainer.cpp
+++ b/share/qtcreator/qml/qmlpuppet/container/propertyvaluecontainer.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/container/propertyvaluecontainer.h
+++ b/share/qtcreator/qml/qmlpuppet/container/propertyvaluecontainer.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/container/reparentcontainer.cpp
+++ b/share/qtcreator/qml/qmlpuppet/container/reparentcontainer.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/container/reparentcontainer.h
+++ b/share/qtcreator/qml/qmlpuppet/container/reparentcontainer.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/container/sharedmemory.h
+++ b/share/qtcreator/qml/qmlpuppet/container/sharedmemory.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/container/sharedmemory_qt.cpp
+++ b/share/qtcreator/qml/qmlpuppet/container/sharedmemory_qt.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/container/sharedmemory_unix.cpp
+++ b/share/qtcreator/qml/qmlpuppet/container/sharedmemory_unix.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp
+++ b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.h
+++ b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/interfaces/commondefines.h
+++ b/share/qtcreator/qml/qmlpuppet/interfaces/commondefines.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceclientinterface.h
+++ b/share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceclientinterface.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceglobal.h
+++ b/share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceglobal.h
@@ -1,3 +1,28 @@
 /****************************************************************************
 **
 ** Copyright (C) 2016 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
 ** 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.
 **
 ** 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.
 **
 ****************************************************************************/
 #ifndef NODEINSTANCEGLOBAL_H
 #define NODEINSTANCEGLOBAL_H
--- a/share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceserverinterface.cpp
+++ b/share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceserverinterface.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceserverinterface.h
+++ b/share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceserverinterface.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/mockfiles/Window.qml
+++ b/share/qtcreator/qml/qmlpuppet/mockfiles/Window.qml
@@ -1,3 +1,28 @@
 /****************************************************************************
 **
 ** Copyright (C) 2016 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
 ** 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.
 **
 ** 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.
 **
 ****************************************************************************/
 import QtQuick 2.1
 import QtQuick.Controls 1.0
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/Info.plist
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/Info.plist
@@ -3,14 +3,23 @@
 <plist version="1.0">
 <dict>
        <key>NSHumanReadableCopyright</key>
-        <string>(C) 2015 The Qt Company Ltd
+        <string>(C) 2016 The Qt Company Ltd
-Commercial Usage
+Commercial License Usage
-Licensees holding valid Qt Commercial licenses may use this tool in accordance with the Qt 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.
+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.
 GNU General Public License Usage
-
+Alternatively, this file may be used under the terms of the GNU
-Alternatively, this tool may be used under the terms of the GNU General Public License version 3.0 as published by the Free Software Foundation and appearing in the file LICENSE.GPLv3 included in the packaging of this tool. Please review the following information to ensure the GNU General Public License version 3.0 requirements will be met: http://www.gnu.org/copyleft/gpl.html.</string>
+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.</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleSignature</key>
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,22 +9,20 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
 #include "anchorchangesnodeinstance.h"
 namespace QmlDesigner {
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,21 +9,20 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
 #ifndef QMLDESIGNER_ANCHORCHANGESNODEINSTANCE_H
 #define QMLDESIGNER_ANCHORCHANGESNODEINSTANCE_H
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/childrenchangeeventfilter.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/childrenchangeeventfilter.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/childrenchangeeventfilter.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/childrenchangeeventfilter.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,17 +9,17 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of Qt Creator.
 **
@@ -9,19 +9,20 @@
 ** 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
+** a written agreement between you and The Qt Company. For licensing terms
-** conditions see http://www.qt.io/terms-conditions.  For further information
+** and conditions see https://www.qt.io/terms-conditions. For further
-** use the contact form at http://www.qt.io/contact-us.
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
+** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPLv3 included in the
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** packaging of this file. Please review the following information to
+** included in the packaging of this file. Please review the following
-** ensure the GNU General Public License version 3.0 requirements will be
+** information to ensure the GNU General Public License requirements will
-** met: http://www.gnu.org/copyleft/gpl.html.
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ****************************************************************************/
 #include "componentnodeinstance.h"
 #include <QQmlComponent>
--- a/Show More
+++ b/Show More