Merge remote-tracking branch 'origin/3.3'qp-v3.4.2qp-v3.4.1qp-v3.4.0-rc1qp-v3.4.0qp-3.4

Change-Id: I8a5730f8d103f697a9179c9783c1bdfc7d5d312b

13 files changed, 52 insertions, 52 deletions

diff --git a/plugins/qmlprofilerextension/QmlProfilerExtension.json.in b/plugins/qmlprofilerextension/QmlProfilerExtension.json.in
index f9f52be9b3..e7154d2e85 100644
--- a/plugins/qmlprofilerextension/QmlProfilerExtension.json.in
+++ b/plugins/qmlprofilerextension/QmlProfilerExtension.json.in
@@ -2,14 +2,14 @@
     \"Name\" : \"QmlProfilerExtension\",
     \"Version\" : \"$$QTCREATOR_VERSION\",
     \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\",
-    \"Vendor\" : \"Digia Plc\",
-    \"Copyright\" : \"(C) 2014 Digia Plc\",
+    \"Vendor\" : \"The Qt Company Ltd\",
+    \"Copyright\" : \"(C) 2015 The Qt Company Ltd\",
     \"License\" : [ \"Commercial Usage\",
                   \"\",
-                  \"Licensees holding valid Qt Commercial licenses may use this plugin 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 Digia.\"
+                  \"Licensees holding valid Qt Commercial licenses may use this plugin 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.\"
     ],
     \"Category\" : \"Qt Quick\",
     \"Description\" : \"Qml Profiler Extension Plugin.\",
-    \"Url\" : \"http://qt.digia.com\",
+    \"Url\" : \"http://www.qt.io\",
     $$dependencyList
 }
diff --git a/plugins/qmlprofilerextension/inputeventsmodel.cpp b/plugins/qmlprofilerextension/inputeventsmodel.cpp
index 1e624f9d39..41403d9016 100644
--- a/plugins/qmlprofilerextension/inputeventsmodel.cpp
+++ b/plugins/qmlprofilerextension/inputeventsmodel.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Digia Plc
+** Copyright (C) 2015 The Qt Company Ltd
 ** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com <http://qt.digia.com/>
+** For any questions to The Qt Company, please use contact form at http://www.qt.io/contact-us
 **
 ** This file is part of the Qt Enterprise Qt Quick Profiler Add-on.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
+** a written agreement between you and The Qt Company.
 **
 ** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com <http://qt.digia.com/>
+** contact form at http://www.qt.io/contact-us
 **
 ****************************************************************************/
 
diff --git a/plugins/qmlprofilerextension/inputeventsmodel.h b/plugins/qmlprofilerextension/inputeventsmodel.h
index 17c47881e9..43a9dc4498 100644
--- a/plugins/qmlprofilerextension/inputeventsmodel.h
+++ b/plugins/qmlprofilerextension/inputeventsmodel.h
@@ -1,18 +1,18 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Digia Plc
+** Copyright (C) 2015 The Qt Company Ltd
 ** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com <http://qt.digia.com/>
+** For any questions to The Qt Company, please use contact form at http://www.qt.io/contact-us
 **
 ** This file is part of the Qt Enterprise Qt Quick Profiler Add-on.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
+** a written agreement between you and The Qt Company.
 **
 ** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com <http://qt.digia.com/>
+** contact form at http://www.qt.io/contact-us
 **
 ****************************************************************************/
 
diff --git a/plugins/qmlprofilerextension/memoryusagemodel.cpp b/plugins/qmlprofilerextension/memoryusagemodel.cpp
index efb158cb36..4510ed59c1 100644
--- a/plugins/qmlprofilerextension/memoryusagemodel.cpp
+++ b/plugins/qmlprofilerextension/memoryusagemodel.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc
+** Copyright (C) 2015 The Qt Company Ltd
 ** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com <http://qt.digia.com/>
+** For any questions to The Qt Company, please use contact form at http://www.qt.io/contact-us
 **
 ** This file is part of the Qt Enterprise Qt Quick Profiler Add-on.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
+** a written agreement between you and The Qt Company.
 **
 ** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com <http://qt.digia.com/>
+** contact form at http://www.qt.io/contact-us
 **
 ****************************************************************************/
 
diff --git a/plugins/qmlprofilerextension/memoryusagemodel.h b/plugins/qmlprofilerextension/memoryusagemodel.h
index 2096675866..acd8431673 100644
--- a/plugins/qmlprofilerextension/memoryusagemodel.h
+++ b/plugins/qmlprofilerextension/memoryusagemodel.h
@@ -1,18 +1,18 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc
+** Copyright (C) 2015 The Qt Company Ltd
 ** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com <http://qt.digia.com/>
+** For any questions to The Qt Company, please use contact form at http://www.qt.io/contact-us
 **
 ** This file is part of the Qt Enterprise Qt Quick Profiler Add-on.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
+** a written agreement between you and The Qt Company.
 **
 ** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com <http://qt.digia.com/>
+** contact form at http://www.qt.io/contact-us
 **
 ****************************************************************************/
 
diff --git a/plugins/qmlprofilerextension/pixmapcachemodel.cpp b/plugins/qmlprofilerextension/pixmapcachemodel.cpp
index 43163c62bb..f6e998596a 100644
--- a/plugins/qmlprofilerextension/pixmapcachemodel.cpp
+++ b/plugins/qmlprofilerextension/pixmapcachemodel.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc
+** Copyright (C) 2015 The Qt Company Ltd
 ** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com <http://qt.digia.com/>
+** For any questions to The Qt Company, please use contact form at http://www.qt.io/contact-us
 **
 ** This file is part of the Qt Enterprise Qt Quick Profiler Add-on.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
+** a written agreement between you and The Qt Company.
 **
 ** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com <http://qt.digia.com/>
+** contact form at http://www.qt.io/contact-us
 **
 ****************************************************************************/
 
diff --git a/plugins/qmlprofilerextension/pixmapcachemodel.h b/plugins/qmlprofilerextension/pixmapcachemodel.h
index 19181384f6..13dc412da1 100644
--- a/plugins/qmlprofilerextension/pixmapcachemodel.h
+++ b/plugins/qmlprofilerextension/pixmapcachemodel.h
@@ -1,18 +1,18 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc
+** Copyright (C) 2015 The Qt Company Ltd
 ** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com <http://qt.digia.com/>
+** For any questions to The Qt Company, please use contact form at http://www.qt.io/contact-us
 **
 ** This file is part of the Qt Enterprise Qt Quick Profiler Add-on.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
+** a written agreement between you and The Qt Company.
 **
 ** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com <http://qt.digia.com/>
+** contact form at http://www.qt.io/contact-us
 **
 ****************************************************************************/
 
diff --git a/plugins/qmlprofilerextension/qmlprofilerextension_global.h b/plugins/qmlprofilerextension/qmlprofilerextension_global.h
index 74b9e7b675..0d98efe3f2 100644
--- a/plugins/qmlprofilerextension/qmlprofilerextension_global.h
+++ b/plugins/qmlprofilerextension/qmlprofilerextension_global.h
@@ -1,18 +1,18 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc
+** Copyright (C) 2015 The Qt Company Ltd
 ** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com <http://qt.digia.com/>
+** For any questions to The Qt Company, please use contact form at http://www.qt.io/contact-us
 **
 ** This file is part of the Qt Enterprise Qt Quick Profiler Add-on.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
+** a written agreement between you and The Qt Company.
 **
 ** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com <http://qt.digia.com/>
+** contact form at http://www.qt.io/contact-us
 **
 ****************************************************************************/
 
diff --git a/plugins/qmlprofilerextension/qmlprofilerextensionconstants.h b/plugins/qmlprofilerextension/qmlprofilerextensionconstants.h
index 866c28ccca..4a1bedbbbb 100644
--- a/plugins/qmlprofilerextension/qmlprofilerextensionconstants.h
+++ b/plugins/qmlprofilerextension/qmlprofilerextensionconstants.h
@@ -1,18 +1,18 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc
+** Copyright (C) 2015 The Qt Company Ltd
 ** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com <http://qt.digia.com/>
+** For any questions to The Qt Company, please use contact form at http://www.qt.io/contact-us
 **
 ** This file is part of the Qt Enterprise Qt Quick Profiler Add-on.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
+** a written agreement between you and The Qt Company.
 **
 ** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com <http://qt.digia.com/>
+** contact form at http://www.qt.io/contact-us
 **
 ****************************************************************************/
 
diff --git a/plugins/qmlprofilerextension/qmlprofilerextensionplugin.cpp b/plugins/qmlprofilerextension/qmlprofilerextensionplugin.cpp
index fff0c431f8..93923332f7 100644
--- a/plugins/qmlprofilerextension/qmlprofilerextensionplugin.cpp
+++ b/plugins/qmlprofilerextension/qmlprofilerextensionplugin.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Digia Plc
+** Copyright (C) 2015 The Qt Company Ltd
 ** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com <http://qt.digia.com/>
+** For any questions to The Qt Company, please use contact form at http://www.qt.io/contact-us
 **
 ** This file is part of the Qt Enterprise Qt Quick Profiler Add-on.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
+** a written agreement between you and The Qt Company.
 **
 ** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com <http://qt.digia.com/>
+** contact form at http://www.qt.io/contact-us
 **
 ****************************************************************************/
 
diff --git a/plugins/qmlprofilerextension/qmlprofilerextensionplugin.h b/plugins/qmlprofilerextension/qmlprofilerextensionplugin.h
index 3da05a9f75..7d0ca94a80 100644
--- a/plugins/qmlprofilerextension/qmlprofilerextensionplugin.h
+++ b/plugins/qmlprofilerextension/qmlprofilerextensionplugin.h
@@ -1,18 +1,18 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc
+** Copyright (C) 2015 The Qt Company Ltd
 ** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com <http://qt.digia.com/>
+** For any questions to The Qt Company, please use contact form at http://www.qt.io/contact-us
 **
 ** This file is part of the Qt Enterprise Qt Quick Profiler Add-on.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
+** a written agreement between you and The Qt Company.
 **
 ** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com <http://qt.digia.com/>
+** contact form at http://www.qt.io/contact-us
 **
 ****************************************************************************/
 
diff --git a/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp b/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp
index ac3bb8e221..7e0bd79f5e 100644
--- a/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp
+++ b/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp
@@ -1,18 +1,18 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc
+** Copyright (C) 2015 The Qt Company Ltd
 ** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com <http://qt.digia.com/>
+** For any questions to The Qt Company, please use contact form at http://www.qt.io/contact-us
 **
 ** This file is part of the Qt Enterprise Qt Quick Profiler Add-on.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
+** a written agreement between you and The Qt Company.
 **
 ** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com <http://qt.digia.com/>
+** contact form at http://www.qt.io/contact-us
 **
 ****************************************************************************/
 
diff --git a/plugins/qmlprofilerextension/scenegraphtimelinemodel.h b/plugins/qmlprofilerextension/scenegraphtimelinemodel.h
index 3e3b6b3128..6225963993 100644
--- a/plugins/qmlprofilerextension/scenegraphtimelinemodel.h
+++ b/plugins/qmlprofilerextension/scenegraphtimelinemodel.h
@@ -1,18 +1,18 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc
+** Copyright (C) 2015 The Qt Company Ltd
 ** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com <http://qt.digia.com/>
+** For any questions to The Qt Company, please use contact form at http://www.qt.io/contact-us
 **
 ** This file is part of the Qt Enterprise Qt Quick Profiler Add-on.
 **
 ** Licensees holding valid Qt Enterprise licenses may use this file in
 ** accordance with the Qt Enterprise License Agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
+** a written agreement between you and The Qt Company.
 **
 ** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com <http://qt.digia.com/>
+** contact form at http://www.qt.io/contact-us
 **
 ****************************************************************************/