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>
This commit is contained in:
Henning Gruendl
2020-01-08 13:56:34 +01:00
committed by Henning Gründl
parent a4055f382c
commit 4ad3cdc115
4 changed files with 10 additions and 38 deletions

View File

@@ -46,4 +46,4 @@ HEADERS += propertyeditorview.h \
aligndistribute.h \ aligndistribute.h \
tooltip.h tooltip.h
QT += qml quick gui-private QT += qml quick

View File

@@ -3,9 +3,8 @@
** Copyright (C) 2020 The Qt Company Ltd. ** Copyright (C) 2020 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/ ** 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 ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
@@ -14,26 +13,13 @@
** and conditions see https://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us. ** 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 ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** 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 ** General Public License version 3 as published by the Free Software
** Public license version 3 or any later version approved by the KDE Free ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** 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 ** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will ** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-2.0.html and ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
** https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

View File

@@ -3,9 +3,8 @@
** Copyright (C) 2020 The Qt Company Ltd. ** Copyright (C) 2020 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/ ** 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 ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in ** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the ** accordance with the commercial license agreement provided with the
@@ -14,26 +13,13 @@
** and conditions see https://www.qt.io/terms-conditions. For further ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us. ** 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 ** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU ** 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 ** General Public License version 3 as published by the Free Software
** Public license version 3 or any later version approved by the KDE Free ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** 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 ** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will ** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-2.0.html and ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
** https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/

View File

@@ -12,7 +12,7 @@ Project {
Depends { Depends {
name: "Qt"; name: "Qt";
submodules: [ submodules: [
"core-private", "gui-private", "quickwidgets" "core-private", "quickwidgets"
] ]
} }
Depends { name: "Core" } Depends { name: "Core" }