Skip to content

Commit dcb14d9

Browse files
migronofmigronof
committed
Merge remote-tracking branch 'origin/5.6' into 5.7
* origin/5.6: Change license text Change-Id: I96caff462667785a48c6f9a63a1a416ecf0e30ff
2 parents 271cf66 + 3847752 commit dcb14d9

7 files changed

+98
-77
lines changed

‎main.cpp

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
1-
/****************************************************************************
1+
/******************************************************************************
22
**
3-
** Copyright (C) 2014 Digia Plc
4-
** All rights reserved.
5-
** For any questions to Digia, please use contact form at http://www.qt.io
3+
** Copyright (C) 2016 The Qt Company Ltd.
4+
** Contact: http://www.qt.io/licensing/
65
**
7-
** This file is part of Qt Enterprise Embedded.
6+
** This file is part of Qt for Device Creation.
87
**
9-
** Licensees holding valid Qt Enterprise licenses may use this file in
10-
** accordance with the Qt Enterprise License Agreement provided with the
8+
** $QT_BEGIN_LICENSE:COMM$
9+
**
10+
** Commercial License Usage
11+
** Licensees holding valid commercial Qt licenses may use this file in
12+
** accordance with the commercial license agreement provided with the
1113
** Software or, alternatively, in accordance with the terms contained in
12-
** a written agreement between you and Digia.
14+
** a written agreement between you and The Qt Company. For licensing terms
15+
** and conditions see http://www.qt.io/terms-conditions. For further
16+
** information use the contact form at http://www.qt.io/contact-us.
1317
**
14-
** If you have questions regarding the use of this file, please use
15-
** contact form at http://www.qt.io
18+
** $QT_END_LICENSE$
1619
**
17-
****************************************************************************/
20+
******************************************************************************/
1821

1922
#include "process.h"
2023
#include "portlist.h"

‎perfprocesshandler.cpp

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
1-
/****************************************************************************
1+
/******************************************************************************
22
**
3-
** Copyright (C) 2015 The Qt Company Ltd
4-
** All rights reserved.
5-
** For any questions to The Qt Company, please use contact form at http://www.qt.io/contact-us
3+
** Copyright (C) 2016 The Qt Company Ltd.
4+
** Contact: http://www.qt.io/licensing/
65
**
7-
** This file is part of QtEnterprise Embedded.
6+
** This file is part of Qt for Device Creation.
87
**
9-
** Licensees holding valid Qt Enterprise licenses may use this file in
10-
** accordance with the Qt Enterprise License Agreement provided with the
8+
** $QT_BEGIN_LICENSE:COMM$
9+
**
10+
** Commercial License Usage
11+
** Licensees holding valid commercial Qt licenses may use this file in
12+
** accordance with the commercial license agreement provided with the
1113
** Software or, alternatively, in accordance with the terms contained in
12-
** a written agreement between you and The Qt Company.
14+
** a written agreement between you and The Qt Company. For licensing terms
15+
** and conditions see http://www.qt.io/terms-conditions. For further
16+
** information use the contact form at http://www.qt.io/contact-us.
1317
**
14-
** If you have questions regarding the use of this file, please use
15-
** contact form at http://www.qt.io/contact-us
18+
** $QT_END_LICENSE$
1619
**
17-
****************************************************************************/
20+
******************************************************************************/
1821

1922
#include "perfprocesshandler.h"
2023
#include <QTcpSocket>

‎perfprocesshandler.h

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
1-
/****************************************************************************
1+
/******************************************************************************
22
**
3-
** Copyright (C) 2015 The Qt Company Ltd
4-
** All rights reserved.
5-
** For any questions to The Qt Company, please use contact form at http://www.qt.io/contact-us
3+
** Copyright (C) 2016 The Qt Company Ltd.
4+
** Contact: http://www.qt.io/licensing/
65
**
7-
** This file is part of QtEnterprise Embedded.
6+
** This file is part of Qt for Device Creation.
87
**
9-
** Licensees holding valid Qt Enterprise licenses may use this file in
10-
** accordance with the Qt Enterprise License Agreement provided with the
8+
** $QT_BEGIN_LICENSE:COMM$
9+
**
10+
** Commercial License Usage
11+
** Licensees holding valid commercial Qt licenses may use this file in
12+
** accordance with the commercial license agreement provided with the
1113
** Software or, alternatively, in accordance with the terms contained in
12-
** a written agreement between you and The Qt Company.
14+
** a written agreement between you and The Qt Company. For licensing terms
15+
** and conditions see http://www.qt.io/terms-conditions. For further
16+
** information use the contact form at http://www.qt.io/contact-us.
1317
**
14-
** If you have questions regarding the use of this file, please use
15-
** contact form at http://www.qt.io/contact-us
18+
** $QT_END_LICENSE$
1619
**
17-
****************************************************************************/
20+
******************************************************************************/
1821

1922
#ifndef PERFPROCESSHANDLER_H
2023
#define PERFPROCESSHANDLER_H

‎portlist.cpp

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
1-
/****************************************************************************
1+
/******************************************************************************
22
**
3-
** Copyright (C) 2014 Digia Plc
4-
** All rights reserved.
5-
** For any questions to Digia, please use contact form at http://www.qt.io
3+
** Copyright (C) 2016 The Qt Company Ltd.
4+
** Contact: http://www.qt.io/licensing/
65
**
7-
** This file is part of Qt Enterprise Embedded.
6+
** This file is part of Qt for Device Creation.
87
**
9-
** Licensees holding valid Qt Enterprise licenses may use this file in
10-
** accordance with the Qt Enterprise License Agreement provided with the
8+
** $QT_BEGIN_LICENSE:COMM$
9+
**
10+
** Commercial License Usage
11+
** Licensees holding valid commercial Qt licenses may use this file in
12+
** accordance with the commercial license agreement provided with the
1113
** Software or, alternatively, in accordance with the terms contained in
12-
** a written agreement between you and Digia.
14+
** a written agreement between you and The Qt Company. For licensing terms
15+
** and conditions see http://www.qt.io/terms-conditions. For further
16+
** information use the contact form at http://www.qt.io/contact-us.
1317
**
14-
** If you have questions regarding the use of this file, please use
15-
** contact form at http://www.qt.io
18+
** $QT_END_LICENSE$
1619
**
17-
****************************************************************************/
20+
******************************************************************************/
1821

1922
#include "portlist.h"
2023

‎portlist.h

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
1-
/****************************************************************************
1+
/******************************************************************************
22
**
3-
** Copyright (C) 2014 Digia Plc
4-
** All rights reserved.
5-
** For any questions to Digia, please use contact form at http://www.qt.io
3+
** Copyright (C) 2016 The Qt Company Ltd.
4+
** Contact: http://www.qt.io/licensing/
65
**
7-
** This file is part of Qt Enterprise Embedded.
6+
** This file is part of Qt for Device Creation.
87
**
9-
** Licensees holding valid Qt Enterprise licenses may use this file in
10-
** accordance with the Qt Enterprise License Agreement provided with the
8+
** $QT_BEGIN_LICENSE:COMM$
9+
**
10+
** Commercial License Usage
11+
** Licensees holding valid commercial Qt licenses may use this file in
12+
** accordance with the commercial license agreement provided with the
1113
** Software or, alternatively, in accordance with the terms contained in
12-
** a written agreement between you and Digia.
14+
** a written agreement between you and The Qt Company. For licensing terms
15+
** and conditions see http://www.qt.io/terms-conditions. For further
16+
** information use the contact form at http://www.qt.io/contact-us.
1317
**
14-
** If you have questions regarding the use of this file, please use
15-
** contact form at http://www.qt.io
18+
** $QT_END_LICENSE$
1619
**
17-
****************************************************************************/
20+
******************************************************************************/
1821

1922
#ifndef PORTLIST_H
2023
#define PORTLIST_H

‎process.cpp

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
1-
/****************************************************************************
1+
/******************************************************************************
22
**
3-
** Copyright (C) 2014 Digia Plc
4-
** All rights reserved.
5-
** For any questions to Digia, please use contact form at http://www.qt.io
3+
** Copyright (C) 2016 The Qt Company Ltd.
4+
** Contact: http://www.qt.io/licensing/
65
**
7-
** This file is part of Qt Enterprise Embedded.
6+
** This file is part of Qt for Device Creation.
87
**
9-
** Licensees holding valid Qt Enterprise licenses may use this file in
10-
** accordance with the Qt Enterprise License Agreement provided with the
8+
** $QT_BEGIN_LICENSE:COMM$
9+
**
10+
** Commercial License Usage
11+
** Licensees holding valid commercial Qt licenses may use this file in
12+
** accordance with the commercial license agreement provided with the
1113
** Software or, alternatively, in accordance with the terms contained in
12-
** a written agreement between you and Digia.
14+
** a written agreement between you and The Qt Company. For licensing terms
15+
** and conditions see http://www.qt.io/terms-conditions. For further
16+
** information use the contact form at http://www.qt.io/contact-us.
1317
**
14-
** If you have questions regarding the use of this file, please use
15-
** contact form at http://www.qt.io
18+
** $QT_END_LICENSE$
1619
**
17-
****************************************************************************/
20+
******************************************************************************/
1821

1922
#include "process.h"
2023
#include <QCoreApplication>

‎process.h

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
1-
/****************************************************************************
1+
/******************************************************************************
22
**
3-
** Copyright (C) 2014 Digia Plc
4-
** All rights reserved.
5-
** For any questions to Digia, please use contact form at http://www.qt.io
3+
** Copyright (C) 2016 The Qt Company Ltd.
4+
** Contact: http://www.qt.io/licensing/
65
**
7-
** This file is part of Qt Enterprise Embedded.
6+
** This file is part of Qt for Device Creation.
87
**
9-
** Licensees holding valid Qt Enterprise licenses may use this file in
10-
** accordance with the Qt Enterprise License Agreement provided with the
8+
** $QT_BEGIN_LICENSE:COMM$
9+
**
10+
** Commercial License Usage
11+
** Licensees holding valid commercial Qt licenses may use this file in
12+
** accordance with the commercial license agreement provided with the
1113
** Software or, alternatively, in accordance with the terms contained in
12-
** a written agreement between you and Digia.
14+
** a written agreement between you and The Qt Company. For licensing terms
15+
** and conditions see http://www.qt.io/terms-conditions. For further
16+
** information use the contact form at http://www.qt.io/contact-us.
1317
**
14-
** If you have questions regarding the use of this file, please use
15-
** contact form at http://www.qt.io
18+
** $QT_END_LICENSE$
1619
**
17-
****************************************************************************/
20+
******************************************************************************/
1821

1922
#ifndef PROCESS_H
2023
#define PROCESS_H

0 commit comments

Comments
 (0)