Merge remote-tracking branch 'origin/5.5' into dev

Change-Id: I39fbf07f7b4fd4fccdd504ee01e286061f4996a2

35 files changed, 140 insertions, 140 deletions

diff --git a/src/doc/src/snippets/declarative/qtbinding/context-advanced/MyItem.qml b/src/doc/src/snippets/declarative/qtbinding/context-advanced/MyItem.qml
index d29e2b91..1a9b8318 100644
--- a/src/doc/src/snippets/declarative/qtbinding/context-advanced/MyItem.qml
+++ b/src/doc/src/snippets/declarative/qtbinding/context-advanced/MyItem.qml
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -17,8 +17,8 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
 **
diff --git a/src/doc/src/snippets/declarative/qtbinding/context-advanced/applicationdata.h b/src/doc/src/snippets/declarative/qtbinding/context-advanced/applicationdata.h
index 97aea301..6bf3c27e 100644
--- a/src/doc/src/snippets/declarative/qtbinding/context-advanced/applicationdata.h
+++ b/src/doc/src/snippets/declarative/qtbinding/context-advanced/applicationdata.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -17,8 +17,8 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
 **
diff --git a/src/doc/src/snippets/declarative/qtbinding/context-advanced/connections.qml b/src/doc/src/snippets/declarative/qtbinding/context-advanced/connections.qml
index 959c24a6..36892960 100644
--- a/src/doc/src/snippets/declarative/qtbinding/context-advanced/connections.qml
+++ b/src/doc/src/snippets/declarative/qtbinding/context-advanced/connections.qml
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -17,8 +17,8 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
 **
diff --git a/src/doc/src/snippets/declarative/qtbinding/context-advanced/main.cpp b/src/doc/src/snippets/declarative/qtbinding/context-advanced/main.cpp
index d0246759..1d39d758 100644
--- a/src/doc/src/snippets/declarative/qtbinding/context-advanced/main.cpp
+++ b/src/doc/src/snippets/declarative/qtbinding/context-advanced/main.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -17,8 +17,8 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
 **
diff --git a/src/doc/src/snippets/declarative/qtbinding/context/MyItem.qml b/src/doc/src/snippets/declarative/qtbinding/context/MyItem.qml
index faa636bb..5407b4b2 100644
--- a/src/doc/src/snippets/declarative/qtbinding/context/MyItem.qml
+++ b/src/doc/src/snippets/declarative/qtbinding/context/MyItem.qml
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -17,8 +17,8 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
 **
diff --git a/src/doc/src/snippets/declarative/qtbinding/context/main.cpp b/src/doc/src/snippets/declarative/qtbinding/context/main.cpp
index 7fdff1ed..ead817d3 100644
--- a/src/doc/src/snippets/declarative/qtbinding/context/main.cpp
+++ b/src/doc/src/snippets/declarative/qtbinding/context/main.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -17,8 +17,8 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
 **
diff --git a/src/doc/src/snippets/declarative/qtbinding/enums/imageviewer.h b/src/doc/src/snippets/declarative/qtbinding/enums/imageviewer.h
index 624c12e1..ef9ad46b 100644
--- a/src/doc/src/snippets/declarative/qtbinding/enums/imageviewer.h
+++ b/src/doc/src/snippets/declarative/qtbinding/enums/imageviewer.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -17,8 +17,8 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
 **
diff --git a/src/doc/src/snippets/declarative/qtbinding/enums/main.cpp b/src/doc/src/snippets/declarative/qtbinding/enums/main.cpp
index f9e9be63..c09c2ec0 100644
--- a/src/doc/src/snippets/declarative/qtbinding/enums/main.cpp
+++ b/src/doc/src/snippets/declarative/qtbinding/enums/main.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -17,8 +17,8 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
 **
diff --git a/src/doc/src/snippets/declarative/qtbinding/enums/standalone.qml b/src/doc/src/snippets/declarative/qtbinding/enums/standalone.qml
index dd4f30f3..7d0d54d3 100644
--- a/src/doc/src/snippets/declarative/qtbinding/enums/standalone.qml
+++ b/src/doc/src/snippets/declarative/qtbinding/enums/standalone.qml
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -17,8 +17,8 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
 **
diff --git a/src/doc/src/snippets/declarative/qtbinding/functions-cpp/MyItem.qml b/src/doc/src/snippets/declarative/qtbinding/functions-cpp/MyItem.qml
index 20adfc09..a73c8c2e 100644
--- a/src/doc/src/snippets/declarative/qtbinding/functions-cpp/MyItem.qml
+++ b/src/doc/src/snippets/declarative/qtbinding/functions-cpp/MyItem.qml
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -17,8 +17,8 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
 **
diff --git a/src/doc/src/snippets/declarative/qtbinding/functions-cpp/main.cpp b/src/doc/src/snippets/declarative/qtbinding/functions-cpp/main.cpp
index 7a91234b..b9a63c26 100644
--- a/src/doc/src/snippets/declarative/qtbinding/functions-cpp/main.cpp
+++ b/src/doc/src/snippets/declarative/qtbinding/functions-cpp/main.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -17,8 +17,8 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
 **
diff --git a/src/doc/src/snippets/declarative/qtbinding/functions-cpp/myclass.h b/src/doc/src/snippets/declarative/qtbinding/functions-cpp/myclass.h
index 51e61d58..fb6c45ee 100644
--- a/src/doc/src/snippets/declarative/qtbinding/functions-cpp/myclass.h
+++ b/src/doc/src/snippets/declarative/qtbinding/functions-cpp/myclass.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -17,8 +17,8 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
 **
diff --git a/src/doc/src/snippets/declarative/qtbinding/functions-qml/MyItem.qml b/src/doc/src/snippets/declarative/qtbinding/functions-qml/MyItem.qml
index 77c0a485..9cc675c1 100644
--- a/src/doc/src/snippets/declarative/qtbinding/functions-qml/MyItem.qml
+++ b/src/doc/src/snippets/declarative/qtbinding/functions-qml/MyItem.qml
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -17,8 +17,8 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
 **
diff --git a/src/doc/src/snippets/declarative/qtbinding/functions-qml/main.cpp b/src/doc/src/snippets/declarative/qtbinding/functions-qml/main.cpp
index 00ded91c..7c55d0f0 100644
--- a/src/doc/src/snippets/declarative/qtbinding/functions-qml/main.cpp
+++ b/src/doc/src/snippets/declarative/qtbinding/functions-qml/main.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -17,8 +17,8 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
 **
diff --git a/src/doc/src/snippets/declarative/qtbinding/loading/MyItem.qml b/src/doc/src/snippets/declarative/qtbinding/loading/MyItem.qml
index 3e77c8cb..d8425b26 100644
--- a/src/doc/src/snippets/declarative/qtbinding/loading/MyItem.qml
+++ b/src/doc/src/snippets/declarative/qtbinding/loading/MyItem.qml
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -17,8 +17,8 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
 **
diff --git a/src/doc/src/snippets/declarative/qtbinding/loading/main.cpp b/src/doc/src/snippets/declarative/qtbinding/loading/main.cpp
index 20c4a4de..6d50e06c 100644
--- a/src/doc/src/snippets/declarative/qtbinding/loading/main.cpp
+++ b/src/doc/src/snippets/declarative/qtbinding/loading/main.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -17,8 +17,8 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
 **
diff --git a/src/doc/src/snippets/declarative/qtbinding/newelements/imageviewer.h b/src/doc/src/snippets/declarative/qtbinding/newelements/imageviewer.h
index 09dde1a7..d3c5da93 100644
--- a/src/doc/src/snippets/declarative/qtbinding/newelements/imageviewer.h
+++ b/src/doc/src/snippets/declarative/qtbinding/newelements/imageviewer.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -17,8 +17,8 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
 **
diff --git a/src/doc/src/snippets/declarative/qtbinding/newelements/main.cpp b/src/doc/src/snippets/declarative/qtbinding/newelements/main.cpp
index 61de704d..0a081690 100644
--- a/src/doc/src/snippets/declarative/qtbinding/newelements/main.cpp
+++ b/src/doc/src/snippets/declarative/qtbinding/newelements/main.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -17,8 +17,8 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
 **
diff --git a/src/doc/src/snippets/declarative/qtbinding/newelements/standalone.qml b/src/doc/src/snippets/declarative/qtbinding/newelements/standalone.qml
index 197ce60e..e945617b 100644
--- a/src/doc/src/snippets/declarative/qtbinding/newelements/standalone.qml
+++ b/src/doc/src/snippets/declarative/qtbinding/newelements/standalone.qml
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -17,8 +17,8 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
 **
diff --git a/src/doc/src/snippets/declarative/qtbinding/properties-cpp/MyItem.qml b/src/doc/src/snippets/declarative/qtbinding/properties-cpp/MyItem.qml
index 9b3db3dd..423caf05 100644
--- a/src/doc/src/snippets/declarative/qtbinding/properties-cpp/MyItem.qml
+++ b/src/doc/src/snippets/declarative/qtbinding/properties-cpp/MyItem.qml
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -17,8 +17,8 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
 **
diff --git a/src/doc/src/snippets/declarative/qtbinding/properties-cpp/applicationdata.h b/src/doc/src/snippets/declarative/qtbinding/properties-cpp/applicationdata.h
index a930e043..1900095b 100644
--- a/src/doc/src/snippets/declarative/qtbinding/properties-cpp/applicationdata.h
+++ b/src/doc/src/snippets/declarative/qtbinding/properties-cpp/applicationdata.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -17,8 +17,8 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
 **
diff --git a/src/doc/src/snippets/declarative/qtbinding/properties-cpp/main.cpp b/src/doc/src/snippets/declarative/qtbinding/properties-cpp/main.cpp
index 864c35d7..9f3541fe 100644
--- a/src/doc/src/snippets/declarative/qtbinding/properties-cpp/main.cpp
+++ b/src/doc/src/snippets/declarative/qtbinding/properties-cpp/main.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -17,8 +17,8 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
 **
diff --git a/src/doc/src/snippets/declarative/qtbinding/properties-qml/MyItem.qml b/src/doc/src/snippets/declarative/qtbinding/properties-qml/MyItem.qml
index 483a735d..322cd4a8 100644
--- a/src/doc/src/snippets/declarative/qtbinding/properties-qml/MyItem.qml
+++ b/src/doc/src/snippets/declarative/qtbinding/properties-qml/MyItem.qml
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -17,8 +17,8 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
 **
diff --git a/src/doc/src/snippets/declarative/qtbinding/properties-qml/main.cpp b/src/doc/src/snippets/declarative/qtbinding/properties-qml/main.cpp
index 9d23c592..00862103 100644
--- a/src/doc/src/snippets/declarative/qtbinding/properties-qml/main.cpp
+++ b/src/doc/src/snippets/declarative/qtbinding/properties-qml/main.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -17,8 +17,8 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
 **
diff --git a/src/doc/src/snippets/declarative/qtbinding/resources/main.cpp b/src/doc/src/snippets/declarative/qtbinding/resources/main.cpp
index 7de9cc98..ad84aa2b 100644
--- a/src/doc/src/snippets/declarative/qtbinding/resources/main.cpp
+++ b/src/doc/src/snippets/declarative/qtbinding/resources/main.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -17,8 +17,8 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
 **
diff --git a/src/doc/src/snippets/declarative/qtbinding/resources/main.qml b/src/doc/src/snippets/declarative/qtbinding/resources/main.qml
index 573fd0a0..b1239cea 100644
--- a/src/doc/src/snippets/declarative/qtbinding/resources/main.qml
+++ b/src/doc/src/snippets/declarative/qtbinding/resources/main.qml
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -17,8 +17,8 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
 **
diff --git a/src/doc/src/snippets/declarative/qtbinding/signals-cpp/MyItem.qml b/src/doc/src/snippets/declarative/qtbinding/signals-cpp/MyItem.qml
index 23d1358c..114389a2 100644
--- a/src/doc/src/snippets/declarative/qtbinding/signals-cpp/MyItem.qml
+++ b/src/doc/src/snippets/declarative/qtbinding/signals-cpp/MyItem.qml
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -17,8 +17,8 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
 **
diff --git a/src/doc/src/snippets/declarative/qtbinding/signals-cpp/imageviewer.h b/src/doc/src/snippets/declarative/qtbinding/signals-cpp/imageviewer.h
index 5953cd12..1ad05210 100644
--- a/src/doc/src/snippets/declarative/qtbinding/signals-cpp/imageviewer.h
+++ b/src/doc/src/snippets/declarative/qtbinding/signals-cpp/imageviewer.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -17,8 +17,8 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
 **
diff --git a/src/doc/src/snippets/declarative/qtbinding/signals-cpp/main.cpp b/src/doc/src/snippets/declarative/qtbinding/signals-cpp/main.cpp
index 4d6f10eb..6b015d62 100644
--- a/src/doc/src/snippets/declarative/qtbinding/signals-cpp/main.cpp
+++ b/src/doc/src/snippets/declarative/qtbinding/signals-cpp/main.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -17,8 +17,8 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
 **
diff --git a/src/doc/src/snippets/declarative/qtbinding/signals-cpp/standalone.qml b/src/doc/src/snippets/declarative/qtbinding/signals-cpp/standalone.qml
index d36b676c..c6a9090a 100644
--- a/src/doc/src/snippets/declarative/qtbinding/signals-cpp/standalone.qml
+++ b/src/doc/src/snippets/declarative/qtbinding/signals-cpp/standalone.qml
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -17,8 +17,8 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
 **
diff --git a/src/doc/src/snippets/declarative/qtbinding/signals-qml/MyItem.qml b/src/doc/src/snippets/declarative/qtbinding/signals-qml/MyItem.qml
index e7dff55e..d8a97395 100644
--- a/src/doc/src/snippets/declarative/qtbinding/signals-qml/MyItem.qml
+++ b/src/doc/src/snippets/declarative/qtbinding/signals-qml/MyItem.qml
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -17,8 +17,8 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
 **
diff --git a/src/doc/src/snippets/declarative/qtbinding/signals-qml/main.cpp b/src/doc/src/snippets/declarative/qtbinding/signals-qml/main.cpp
index 90addd49..62f890ec 100644
--- a/src/doc/src/snippets/declarative/qtbinding/signals-qml/main.cpp
+++ b/src/doc/src/snippets/declarative/qtbinding/signals-qml/main.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -17,8 +17,8 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
 **
diff --git a/src/doc/src/snippets/declarative/qtbinding/signals-qml/myclass.h b/src/doc/src/snippets/declarative/qtbinding/signals-qml/myclass.h
index 87587522..c7246aee 100644
--- a/src/doc/src/snippets/declarative/qtbinding/signals-qml/myclass.h
+++ b/src/doc/src/snippets/declarative/qtbinding/signals-qml/myclass.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -17,8 +17,8 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
 **
diff --git a/src/doc/src/snippets/declarative/qtbinding/variantlistmap/MyItem.qml b/src/doc/src/snippets/declarative/qtbinding/variantlistmap/MyItem.qml
index 45949a3d..50dc615a 100644
--- a/src/doc/src/snippets/declarative/qtbinding/variantlistmap/MyItem.qml
+++ b/src/doc/src/snippets/declarative/qtbinding/variantlistmap/MyItem.qml
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -17,8 +17,8 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
 **
diff --git a/src/doc/src/snippets/declarative/qtbinding/variantlistmap/main.cpp b/src/doc/src/snippets/declarative/qtbinding/variantlistmap/main.cpp
index 23910cb6..611bc413 100644
--- a/src/doc/src/snippets/declarative/qtbinding/variantlistmap/main.cpp
+++ b/src/doc/src/snippets/declarative/qtbinding/variantlistmap/main.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -17,8 +17,8 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
 **