diff options
author | Henning Gruendl <henning.gruendl@qt.io> | 2020-01-08 13:56:34 +0100 |
---|---|---|
committer | Henning Gründl <henning.gruendl@qt.io> | 2020-01-09 11:47:40 +0000 |
commit | 4ad3cdc1159dd4f2a4478e85b69c984c11127367 (patch) | |
tree | 0497e3cc193f943091142354a84b90f02e8aa08e | |
parent | a4055f382c194198473b21b95fc0aedbc00a0477 (diff) | |
download | qt-creator-4ad3cdc1159dd4f2a4478e85b69c984c11127367.tar.gz |
QmlDesigner: Fix tooltip license header
- Fix tooltip license header
- Remove gui-private from qbs and pri, no longer needed
Change-Id: I80bffccca825be2940dac8b0e07d2861e2f8b3d8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
4 files changed, 10 insertions, 38 deletions
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.pri b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.pri index a6002c86c8..7516c45c2b 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.pri +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.pri @@ -46,4 +46,4 @@ HEADERS += propertyeditorview.h \ aligndistribute.h \ tooltip.h -QT += qml quick gui-private +QT += qml quick diff --git a/src/plugins/qmldesigner/components/propertyeditor/tooltip.cpp b/src/plugins/qmldesigner/components/propertyeditor/tooltip.cpp index ec4085ef83..80f7a66d5e 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/tooltip.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/tooltip.cpp @@ -3,9 +3,8 @@ ** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of Qt Creator. ** -** $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 @@ -14,26 +13,13 @@ ** 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 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. -** ** 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 +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT ** 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$ +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ****************************************************************************/ diff --git a/src/plugins/qmldesigner/components/propertyeditor/tooltip.h b/src/plugins/qmldesigner/components/propertyeditor/tooltip.h index 785a1b51d4..46d213c2dd 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/tooltip.h +++ b/src/plugins/qmldesigner/components/propertyeditor/tooltip.h @@ -3,9 +3,8 @@ ** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of Qt Creator. ** -** $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 @@ -14,26 +13,13 @@ ** 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 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. -** ** 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 +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT ** 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$ +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ****************************************************************************/ diff --git a/src/plugins/qmldesigner/qmldesignerplugin.qbs b/src/plugins/qmldesigner/qmldesignerplugin.qbs index 6b11bf52bf..10e4497fd9 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.qbs +++ b/src/plugins/qmldesigner/qmldesignerplugin.qbs @@ -12,7 +12,7 @@ Project { Depends { name: "Qt"; submodules: [ - "core-private", "gui-private", "quickwidgets" + "core-private", "quickwidgets" ] } Depends { name: "Core" } |