diff options
author | Liang Qi <liang.qi@qt.io> | 2016-06-30 13:32:55 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-06-30 13:32:55 +0200 |
commit | 0496e7f73afa69cadb3742b7423b2c8ae3665c13 (patch) | |
tree | 908065953aff1eca667b3b075de254df68420e73 /src/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp | |
parent | 2ec8a7baff14f476322ca96830c844a9d05b7b6d (diff) | |
parent | 3b1da8a7754b37d5767aeb55a7ca46e4180a6109 (diff) |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/assistant/qcollectiongenerator/main.cpp
src/qtestlib/wince/cetcpsync/main.cpp
src/qtestlib/wince/cetcpsync/qtcesterconnection.cpp
src/qtestlib/wince/cetcpsync/qtcesterconnection.h
src/qtestlib/wince/cetcpsync/remoteconnection.cpp
src/qtestlib/wince/cetcpsync/remoteconnection.h
src/qtestlib/wince/cetcpsyncserver/commands.cpp
src/qtestlib/wince/cetcpsyncserver/commands.h
src/qtestlib/wince/cetcpsyncserver/connectionmanager.cpp
src/qtestlib/wince/cetcpsyncserver/connectionmanager.h
src/qtestlib/wince/cetcpsyncserver/main.cpp
src/qtestlib/wince/cetcpsyncserver/transfer_global.h
src/qtestlib/wince/cetest/activesyncconnection.cpp
src/qtestlib/wince/cetest/activesyncconnection.h
src/qtestlib/wince/cetest/cetcpsyncconnection.cpp
src/qtestlib/wince/cetest/cetcpsyncconnection.h
src/qtestlib/wince/cetest/deployment.cpp
src/qtestlib/wince/cetest/deployment.h
src/qtestlib/wince/cetest/main.cpp
src/qtestlib/wince/cetest/remoteconnection.cpp
src/qtestlib/wince/cetest/remoteconnection.h
src/qtestlib/wince/remotelib/commands.cpp
src/qtestlib/wince/remotelib/commands.h
Change-Id: Ia1b311710f7e8009ca1697faae3ae5e37e80ecc3
Diffstat (limited to 'src/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp')
-rw-r--r-- | src/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/src/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp b/src/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp index 19bc1ce98..015a36baf 100644 --- a/src/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp +++ b/src/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp @@ -1,31 +1,37 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the tools applications of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL21$ +** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the 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. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. ** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** |