Merge remote-tracking branch 'origin/3.3'

Conflicts:
	plugins/clangstaticanalyzer/ClangStaticAnalyzer.json.in

Change-Id: Iffa578b015c51375cdb2d9930830cb2d76433bc7

1 files changed, 4 insertions, 4 deletions

diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzerrunner.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzerrunner.cpp
index d2cc637cc24..be3cc8607de 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
 **
 ****************************************************************************/