feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.3'

Browse Source 
Conflicts:
	plugins/clangstaticanalyzer/ClangStaticAnalyzer.json.in

Change-Id: Iffa578b015c51375cdb2d9930830cb2d76433bc7
This commit is contained in:
Eike Ziller
2015-02-13 09:37:39 +01:00
parent 19476fb70e c98db856f9
commit a8dfba176b
29 changed files with 116 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
View File

@@ -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
**
****************************************************************************/