From 5e8feb64d6a3cf50360c066e4595e41021bd0f9c Mon Sep 17 00:00:00 2001 From: Craig Scott Date: Mon, 31 May 2021 16:40:54 +1000 Subject: Update to latest qml CMake API The new qml CMake API places a closer relationship between the backing target and the plugin target. Both are typically created together and they share a lot of common details. Instead of creating them in different parts of the source tree, they are now specified together. The src/imports area has effectively been absorbed into the other corresponding subdirectories below src with this change. Task-number: QTBUG-91621 Change-Id: I9bd32e9eb78c198ccc9db04e2829303cac323502 Reviewed-by: Fabian Kosmale --- src/imports/controls/imagine/Button.qml | 98 --------------------------------- 1 file changed, 98 deletions(-) delete mode 100644 src/imports/controls/imagine/Button.qml (limited to 'src/imports/controls/imagine/Button.qml') diff --git a/src/imports/controls/imagine/Button.qml b/src/imports/controls/imagine/Button.qml deleted file mode 100644 index f2228ec7..00000000 --- a/src/imports/controls/imagine/Button.qml +++ /dev/null @@ -1,98 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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. -** -** 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.LGPLv3 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.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 later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick -import QtQuick.Templates as T -import QtQuick.Controls.impl -import QtQuick.Controls.Imagine -import QtQuick.Controls.Imagine.impl - -T.Button { - id: control - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - implicitContentWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, - implicitContentHeight + topPadding + bottomPadding) - - spacing: 6 // ### - - topPadding: background ? background.topPadding : 0 - leftPadding: background ? background.leftPadding : 0 - rightPadding: background ? background.rightPadding : 0 - bottomPadding: background ? background.bottomPadding : 0 - - topInset: background ? -background.topInset || 0 : 0 - leftInset: background ? -background.leftInset || 0 : 0 - rightInset: background ? -background.rightInset || 0 : 0 - bottomInset: background ? -background.bottomInset || 0 : 0 - - icon.width: 24 - icon.height: 24 - icon.color: control.enabled && control.flat && control.highlighted ? control.palette.highlight - : control.enabled && (control.down || control.checked || control.highlighted) && !control.flat - ? control.palette.brightText : control.flat ? control.palette.windowText : control.palette.buttonText - - contentItem: IconLabel { - spacing: control.spacing - mirrored: control.mirrored - display: control.display - - icon: control.icon - text: control.text - font: control.font - color: control.enabled && control.flat && control.highlighted ? control.palette.highlight - : control.enabled && (control.down || control.checked || control.highlighted) && !control.flat - ? control.palette.brightText : control.flat ? control.palette.windowText : control.palette.buttonText - } - - background: NinePatchImage { - source: Imagine.url + "button-background" - NinePatchImageSelector on source { - states: [ - {"disabled": !control.enabled}, - {"pressed": control.down}, - {"checked": control.checked}, - {"checkable": control.checkable}, - {"focused": control.visualFocus}, - {"highlighted": control.highlighted}, - {"mirrored": control.mirrored}, - {"flat": control.flat}, - {"hovered": control.hovered} - ] - } - } -} -- cgit v1.2.3