Merge remote-tracking branch 'origin/3.3'

Conflicts:
	plugins/clangstaticanalyzer/ClangStaticAnalyzer.json.in

Change-Id: Iffa578b015c51375cdb2d9930830cb2d76433bc7

29 files changed, 116 insertions, 116 deletions

diff --git a/plugins/clangstaticanalyzer/ClangStaticAnalyzer.json.in b/plugins/clangstaticanalyzer/ClangStaticAnalyzer.json.in
index 77cc31b40d..081dc1eef6 100644
--- a/plugins/clangstaticanalyzer/ClangStaticAnalyzer.json.in
+++ b/plugins/clangstaticanalyzer/ClangStaticAnalyzer.json.in
@@ -3,14 +3,14 @@
     \"Version\" : \"$$QTCREATOR_VERSION\",
     \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\",
     \"Experimental\" : true,
-    \"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\" : \"Code Analyzer\",
     \"Description\" : \"ClangStaticAnalyzer Plugin.\",
-    \"Url\" : \"http://qt.digia.com\",
+    \"Url\" : \"http://www.qt.io\",
     $$dependencyList
 }
diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzer_global.h b/plugins/clangstaticanalyzer/clangstaticanalyzer_global.h
index a3fc0a8b85..bc96f936e0 100644
--- a/plugins/clangstaticanalyzer/clangstaticanalyzer_global.h
+++ b/plugins/clangstaticanalyzer/clangstaticanalyzer_global.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/clangstaticanalyzer/clangstaticanalyzerconfigwidget.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzerconfigwidget.cpp
index c0ae86af94..d6ff0fa5b8 100644
--- a/plugins/clangstaticanalyzer/clangstaticanalyzerconfigwidget.cpp
+++ b/plugins/clangstaticanalyzer/clangstaticanalyzerconfigwidget.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 LicenseChecker 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/clangstaticanalyzer/clangstaticanalyzerconfigwidget.h b/plugins/clangstaticanalyzer/clangstaticanalyzerconfigwidget.h
index 939766622a..11c6018fef 100644
--- a/plugins/clangstaticanalyzer/clangstaticanalyzerconfigwidget.h
+++ b/plugins/clangstaticanalyzer/clangstaticanalyzerconfigwidget.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 LicenseChecker 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/clangstaticanalyzer/clangstaticanalyzerconstants.h b/plugins/clangstaticanalyzer/clangstaticanalyzerconstants.h
index 85a05087a6..04ed79b998 100644
--- a/plugins/clangstaticanalyzer/clangstaticanalyzerconstants.h
+++ b/plugins/clangstaticanalyzer/clangstaticanalyzerconstants.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 LicenseChecker 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/clangstaticanalyzer/clangstaticanalyzerdiagnostic.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnostic.cpp
index 09d810dfc9..a20ed6caa8 100644
--- a/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnostic.cpp
+++ b/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnostic.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 LicenseChecker 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/clangstaticanalyzer/clangstaticanalyzerdiagnostic.h b/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnostic.h
index 75df6218a9..dfb2f44962 100644
--- a/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnostic.h
+++ b/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnostic.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 LicenseChecker 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/clangstaticanalyzer/clangstaticanalyzerdiagnosticmodel.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticmodel.cpp
index 2b21765331..5f1d21fb9f 100644
--- a/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticmodel.cpp
+++ b/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticmodel.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 LicenseChecker 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/clangstaticanalyzer/clangstaticanalyzerdiagnosticmodel.h b/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticmodel.h
index d3af814982..68dcf7ed05 100644
--- a/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticmodel.h
+++ b/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticmodel.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 LicenseChecker 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/clangstaticanalyzer/clangstaticanalyzerdiagnosticview.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticview.cpp
index 646bd9380b..54c8ef5a53 100644
--- a/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticview.cpp
+++ b/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticview.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 LicenseChecker 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/clangstaticanalyzer/clangstaticanalyzerdiagnosticview.h b/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticview.h
index 70dd1a8e15..2097b0da06 100644
--- a/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticview.h
+++ b/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticview.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 LicenseChecker 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/clangstaticanalyzer/clangstaticanalyzerlogfilereader.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzerlogfilereader.cpp
index f5c4b438d3..eb90543969 100644
--- a/plugins/clangstaticanalyzer/clangstaticanalyzerlogfilereader.cpp
+++ b/plugins/clangstaticanalyzer/clangstaticanalyzerlogfilereader.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 LicenseChecker 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/clangstaticanalyzer/clangstaticanalyzerlogfilereader.h b/plugins/clangstaticanalyzer/clangstaticanalyzerlogfilereader.h
index fe8f5075ff..f2febffd77 100644
--- a/plugins/clangstaticanalyzer/clangstaticanalyzerlogfilereader.h
+++ b/plugins/clangstaticanalyzer/clangstaticanalyzerlogfilereader.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 LicenseChecker 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/clangstaticanalyzer/clangstaticanalyzerplugin.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.cpp
index 943d7ac7e5..1c09b0039e 100644
--- a/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.cpp
+++ b/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.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/clangstaticanalyzer/clangstaticanalyzerplugin.h b/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.h
index c0a6a247fb..8ab54ae43c 100644
--- a/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.h
+++ b/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.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/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
index e027d24907..15deb7b9ce 100644
--- a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
+++ b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.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 LicenseChecker 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/clangstaticanalyzer/clangstaticanalyzerruncontrol.h b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.h
index b47b6c8bab..ff74644619 100644
--- a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.h
+++ b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.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 LicenseChecker 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/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.cpp
index 10cd919340..03b7355cd6 100644
--- a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.cpp
+++ b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.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 LicenseChecker 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/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.h b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.h
index a325691972..3d06a5e80f 100644
--- a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.h
+++ b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.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 LicenseChecker 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/clangstaticanalyzer/clangstaticanalyzerrunner.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzerrunner.cpp
index d2cc637cc2..be3cc8607d 100644
--- a/plugins/clangstaticanalyzer/clangstaticanalyzerrunner.cpp
+++ b/plugins/clangstaticanalyzer/clangstaticanalyzerrunner.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 LicenseChecker 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/clangstaticanalyzer/clangstaticanalyzerrunner.h b/plugins/clangstaticanalyzer/clangstaticanalyzerrunner.h
index b175ef8b3f..6164d6ab80 100644
--- a/plugins/clangstaticanalyzer/clangstaticanalyzerrunner.h
+++ b/plugins/clangstaticanalyzer/clangstaticanalyzerrunner.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 LicenseChecker 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/clangstaticanalyzer/clangstaticanalyzersettings.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzersettings.cpp
index a6445b1630..774bf4941b 100644
--- a/plugins/clangstaticanalyzer/clangstaticanalyzersettings.cpp
+++ b/plugins/clangstaticanalyzer/clangstaticanalyzersettings.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 LicenseChecker 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/clangstaticanalyzer/clangstaticanalyzersettings.h b/plugins/clangstaticanalyzer/clangstaticanalyzersettings.h
index bca154c561..71c4c21864 100644
--- a/plugins/clangstaticanalyzer/clangstaticanalyzersettings.h
+++ b/plugins/clangstaticanalyzer/clangstaticanalyzersettings.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 LicenseChecker 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/clangstaticanalyzer/clangstaticanalyzertool.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp
index 93579781a0..4fbc2aa5b5 100644
--- a/plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp
+++ b/plugins/clangstaticanalyzer/clangstaticanalyzertool.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 LicenseChecker 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/clangstaticanalyzer/clangstaticanalyzertool.h b/plugins/clangstaticanalyzer/clangstaticanalyzertool.h
index 4b61ae0fda..24c39e3b39 100644
--- a/plugins/clangstaticanalyzer/clangstaticanalyzertool.h
+++ b/plugins/clangstaticanalyzer/clangstaticanalyzertool.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 LicenseChecker 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/clangstaticanalyzer/clangstaticanalyzerutils.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzerutils.cpp
index e349ebe8c5..06401eb287 100644
--- a/plugins/clangstaticanalyzer/clangstaticanalyzerutils.cpp
+++ b/plugins/clangstaticanalyzer/clangstaticanalyzerutils.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 LicenseChecker 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/clangstaticanalyzer/clangstaticanalyzerutils.h b/plugins/clangstaticanalyzer/clangstaticanalyzerutils.h
index 0c7a49b18d..e85d25f286 100644
--- a/plugins/clangstaticanalyzer/clangstaticanalyzerutils.h
+++ b/plugins/clangstaticanalyzer/clangstaticanalyzerutils.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 LicenseChecker 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/clangstaticanalyzer/tests/clangstaticanalyzerlogfilereader/tst_clangstaticanalyzerlogfilereader.cpp b/plugins/clangstaticanalyzer/tests/clangstaticanalyzerlogfilereader/tst_clangstaticanalyzerlogfilereader.cpp
index 76dd0cf862..89547adcaa 100644
--- a/plugins/clangstaticanalyzer/tests/clangstaticanalyzerlogfilereader/tst_clangstaticanalyzerlogfilereader.cpp
+++ b/plugins/clangstaticanalyzer/tests/clangstaticanalyzerlogfilereader/tst_clangstaticanalyzerlogfilereader.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 LicenseChecker 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/clangstaticanalyzer/tests/clangstaticanalyzerrunner/tst_clangstaticanalyzerrunner.cpp b/plugins/clangstaticanalyzer/tests/clangstaticanalyzerrunner/tst_clangstaticanalyzerrunner.cpp
index c3a51062c8..428213717f 100644
--- a/plugins/clangstaticanalyzer/tests/clangstaticanalyzerrunner/tst_clangstaticanalyzerrunner.cpp
+++ b/plugins/clangstaticanalyzer/tests/clangstaticanalyzerrunner/tst_clangstaticanalyzerrunner.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 LicenseChecker 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
 **
 ****************************************************************************/