diff options
Diffstat (limited to 'src/imports/controls/macos')
-rw-r--r-- | src/imports/controls/macos/Button.qml | 42 | ||||
-rw-r--r-- | src/imports/controls/macos/CMakeLists.txt | 100 | ||||
-rw-r--r-- | src/imports/controls/macos/CheckBox.qml | 42 | ||||
-rw-r--r-- | src/imports/controls/macos/ComboBox.qml | 42 | ||||
-rw-r--r-- | src/imports/controls/macos/Dial.qml | 42 | ||||
-rw-r--r-- | src/imports/controls/macos/Frame.qml | 42 | ||||
-rw-r--r-- | src/imports/controls/macos/GroupBox.qml | 42 | ||||
-rw-r--r-- | src/imports/controls/macos/ProgressBar.qml | 42 | ||||
-rw-r--r-- | src/imports/controls/macos/RadioButton.qml | 42 | ||||
-rw-r--r-- | src/imports/controls/macos/ScrollBar.qml | 65 | ||||
-rw-r--r-- | src/imports/controls/macos/Slider.qml | 42 | ||||
-rw-r--r-- | src/imports/controls/macos/SpinBox.qml | 123 | ||||
-rw-r--r-- | src/imports/controls/macos/TextArea.qml | 42 | ||||
-rw-r--r-- | src/imports/controls/macos/TextField.qml | 42 | ||||
-rw-r--r-- | src/imports/controls/macos/macos.pri | 14 | ||||
-rw-r--r-- | src/imports/controls/macos/macos.pro | 28 | ||||
-rw-r--r-- | src/imports/controls/macos/qmldir | 18 | ||||
-rw-r--r-- | src/imports/controls/macos/qtquickcontrols2macosstyleplugin.cpp | 65 |
18 files changed, 0 insertions, 875 deletions
diff --git a/src/imports/controls/macos/Button.qml b/src/imports/controls/macos/Button.qml deleted file mode 100644 index 6d5e1503..00000000 --- a/src/imports/controls/macos/Button.qml +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2020 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.Controls -import QtQuick.NativeStyle as NativeStyle - -NativeStyle.DefaultButton { -} diff --git a/src/imports/controls/macos/CMakeLists.txt b/src/imports/controls/macos/CMakeLists.txt deleted file mode 100644 index 59a1a1f7..00000000 --- a/src/imports/controls/macos/CMakeLists.txt +++ /dev/null @@ -1,100 +0,0 @@ -# Generated from macos.pro. - -##################################################################### -## qtquickcontrols2macosstyleplugin Plugin: -##################################################################### - -qt_add_qml_module(qtquickcontrols2macosstyleplugin - URI "QtQuick.Controls.macOS" - VERSION "6.0" # special case - CLASSNAME QtQuickControls2MacOSStylePlugin - IMPORTS - QtQuick.Controls.Fusion/auto - GENERATE_QMLTYPES - SOURCES - qtquickcontrols2macosstyleplugin.cpp - DEFINES - QT_NO_CAST_FROM_ASCII - QT_NO_CAST_TO_ASCII - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::QmlPrivate - Qt::QuickControls2Private - Qt::QuickPrivate - Qt::QuickTemplates2Private - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui - Qt::Qml - Qt::Quick - Qt::QuickControls2 - Qt::QuickTemplates2 -) - -#### Keys ignored in scope 1:.:.:macos.pro:<TRUE>: -# OTHER_FILES = "qmldir" "$$QML_FILES" -# QML_IMPORT_NAME = "QtQuick.Controls.macOS" -# QML_IMPORT_VERSION = "$$QT_VERSION" -# TARGETPATH = "QtQuick/Controls/macOS" -# _REQUIREMENTS = "qtConfig(quickcontrols2-macos)" - -set(qml_files - "Button.qml" - "Slider.qml" - "GroupBox.qml" - "CheckBox.qml" - "RadioButton.qml" - "SpinBox.qml" - "TextField.qml" - "Frame.qml" - "TextArea.qml" - "ComboBox.qml" - "ScrollBar.qml" - "ProgressBar.qml" - "Dial.qml" -) -set_source_files_properties(Button.qml PROPERTIES - QT_QML_SOURCE_VERSION "6.0" -) -set_source_files_properties(Slider.qml PROPERTIES - QT_QML_SOURCE_VERSION "6.0" -) -set_source_files_properties(GroupBox.qml PROPERTIES - QT_QML_SOURCE_VERSION "6.0" -) -set_source_files_properties(CheckBox.qml PROPERTIES - QT_QML_SOURCE_VERSION "6.0" -) -set_source_files_properties(RadioButton.qml PROPERTIES - QT_QML_SOURCE_VERSION "6.0" -) -set_source_files_properties(SpinBox.qml PROPERTIES - QT_QML_SOURCE_VERSION "6.0" -) -set_source_files_properties(TextField.qml PROPERTIES - QT_QML_SOURCE_VERSION "6.0" -) -set_source_files_properties(Frame.qml PROPERTIES - QT_QML_SOURCE_VERSION "6.0" -) -set_source_files_properties(TextArea.qml PROPERTIES - QT_QML_SOURCE_VERSION "6.0" -) -set_source_files_properties(ComboBox.qml PROPERTIES - QT_QML_SOURCE_VERSION "6.0" -) -set_source_files_properties(ScrollBar.qml PROPERTIES - QT_QML_SOURCE_VERSION "6.0" -) -set_source_files_properties(ProgressBar.qml PROPERTIES - QT_QML_SOURCE_VERSION "6.0" -) -set_source_files_properties(Dial.qml PROPERTIES - QT_QML_SOURCE_VERSION "6.0" -) - -qt6_target_qml_files(qtquickcontrols2macosstyleplugin - FILES - ${qml_files} -) diff --git a/src/imports/controls/macos/CheckBox.qml b/src/imports/controls/macos/CheckBox.qml deleted file mode 100644 index 9caf3dd0..00000000 --- a/src/imports/controls/macos/CheckBox.qml +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2020 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.Controls -import QtQuick.NativeStyle as NativeStyle - -NativeStyle.DefaultCheckBox { -} diff --git a/src/imports/controls/macos/ComboBox.qml b/src/imports/controls/macos/ComboBox.qml deleted file mode 100644 index c3880aba..00000000 --- a/src/imports/controls/macos/ComboBox.qml +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2020 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.Controls -import QtQuick.NativeStyle as NativeStyle - -NativeStyle.DefaultComboBox { -} diff --git a/src/imports/controls/macos/Dial.qml b/src/imports/controls/macos/Dial.qml deleted file mode 100644 index 90779f71..00000000 --- a/src/imports/controls/macos/Dial.qml +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2020 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.Controls -import QtQuick.NativeStyle as NativeStyle - -NativeStyle.DefaultDial { -} diff --git a/src/imports/controls/macos/Frame.qml b/src/imports/controls/macos/Frame.qml deleted file mode 100644 index 0b45b352..00000000 --- a/src/imports/controls/macos/Frame.qml +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2020 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.Controls -import QtQuick.NativeStyle as NativeStyle - -NativeStyle.DefaultFrame { -} diff --git a/src/imports/controls/macos/GroupBox.qml b/src/imports/controls/macos/GroupBox.qml deleted file mode 100644 index 42e6993d..00000000 --- a/src/imports/controls/macos/GroupBox.qml +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2020 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.Controls -import QtQuick.NativeStyle as NativeStyle - -NativeStyle.DefaultGroupBox { -} diff --git a/src/imports/controls/macos/ProgressBar.qml b/src/imports/controls/macos/ProgressBar.qml deleted file mode 100644 index b12798fb..00000000 --- a/src/imports/controls/macos/ProgressBar.qml +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2020 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.Controls -import QtQuick.NativeStyle as NativeStyle - -NativeStyle.DefaultProgressBar { -} diff --git a/src/imports/controls/macos/RadioButton.qml b/src/imports/controls/macos/RadioButton.qml deleted file mode 100644 index 9670abef..00000000 --- a/src/imports/controls/macos/RadioButton.qml +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2020 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.Controls -import QtQuick.NativeStyle as NativeStyle - -NativeStyle.DefaultRadioButton { -} diff --git a/src/imports/controls/macos/ScrollBar.qml b/src/imports/controls/macos/ScrollBar.qml deleted file mode 100644 index c935fecb..00000000 --- a/src/imports/controls/macos/ScrollBar.qml +++ /dev/null @@ -1,65 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2020 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.Controls -import QtQuick.NativeStyle as NativeStyle - -NativeStyle.DefaultScrollBar { - id: controlRoot - - contentItem: NativeStyle.ScrollBar { - control: controlRoot - subControl: NativeStyle.ScrollBar.Handle - overrideState: NativeStyle.ScrollBar.NeverHovered - } - - NativeStyle.ScrollBar { - // Fade a hovered-looking version of the handle - // on top of the default handle when hovering it - x: contentItem.x - y: contentItem.y - width: contentItem.width - height: contentItem.height - control: controlRoot - subControl: NativeStyle.ScrollBar.Handle - overrideState: NativeStyle.ScrollBar.AlwaysHovered - opacity: controlRoot.hovered || control.pressed ? 1 : 0 - visible: contentItem instanceof NativeStyle.StyleItem - Behavior on opacity { NumberAnimation { duration: 150 } } - } - -} diff --git a/src/imports/controls/macos/Slider.qml b/src/imports/controls/macos/Slider.qml deleted file mode 100644 index 1d04beca..00000000 --- a/src/imports/controls/macos/Slider.qml +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2020 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.Controls -import QtQuick.NativeStyle as NativeStyle - -NativeStyle.DefaultSlider { -} diff --git a/src/imports/controls/macos/SpinBox.qml b/src/imports/controls/macos/SpinBox.qml deleted file mode 100644 index a178dd14..00000000 --- a/src/imports/controls/macos/SpinBox.qml +++ /dev/null @@ -1,123 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2020 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.Controls -import QtQuick.Templates as T -import QtQuick.NativeStyle as NativeStyle - -T.SpinBox { - id: control - - property bool nativeBackground: background instanceof NativeStyle.StyleItem - property bool nativeIndicators: up.indicator.hasOwnProperty("_qt_default") - && down.indicator.hasOwnProperty("_qt_default") - - font.pixelSize: nativeBackground ? background.styleFont(control).pixelSize : undefined - - implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, - 90 /* minimum */ ) - implicitHeight: Math.max(implicitBackgroundHeight, up.implicitIndicatorHeight + down.implicitIndicatorHeight) - + topInset + bottomInset - - spacing: 2 - - // Push the background right to make room for the indicators - rightInset: nativeIndicators ? up.implicitIndicatorWidth + spacing : 0 - - leftPadding: nativeBackground ? background.contentPadding.left: 0 - topPadding: nativeBackground ? background.contentPadding.top: 0 - rightPadding: (nativeBackground ? background.contentPadding.right : 0) + rightInset - bottomPadding: nativeBackground ? background.contentPadding.bottom: 0 - - validator: IntValidator { - locale: control.locale.name - bottom: Math.min(control.from, control.to) - top: Math.max(control.from, control.to) - } - - contentItem: TextInput { - text: control.displayText - font: control.font - color: control.palette.text - selectionColor: control.palette.highlight - selectedTextColor: control.palette.highlightedText - horizontalAlignment: Qt.AlignLeft - verticalAlignment: Qt.AlignVCenter - - topPadding: 2 - bottomPadding: 2 - leftPadding: 10 - rightPadding: 10 - - readOnly: !control.editable - validator: control.validator - inputMethodHints: control.inputMethodHints - } - - NativeStyle.SpinBox { - id: upAndDown - control: control - subControl: NativeStyle.SpinBox.Up - visible: nativeIndicators - x: up.indicator.x - y: up.indicator.y - useNinePatchImage: false - } - - up.indicator: Item { - x: parent.width - width - y: (parent.height / 2) - height - implicitWidth: upAndDown.width - implicitHeight: upAndDown.height / 2 - property bool _qt_default - } - - down.indicator: Item { - x: parent.width - width - y: up.indicator.y + upAndDown.height / 2 - implicitWidth: upAndDown.width - implicitHeight: upAndDown.height / 2 - property bool _qt_default - } - - background: NativeStyle.SpinBox { - control: control - subControl: NativeStyle.SpinBox.Frame - contentWidth: contentItem.implicitWidth - contentHeight: contentItem.implicitHeight - } -} diff --git a/src/imports/controls/macos/TextArea.qml b/src/imports/controls/macos/TextArea.qml deleted file mode 100644 index 51982ff6..00000000 --- a/src/imports/controls/macos/TextArea.qml +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2020 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.Controls -import QtQuick.NativeStyle as NativeStyle - -NativeStyle.DefaultTextArea { -} diff --git a/src/imports/controls/macos/TextField.qml b/src/imports/controls/macos/TextField.qml deleted file mode 100644 index f96023a6..00000000 --- a/src/imports/controls/macos/TextField.qml +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2020 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.Controls -import QtQuick.NativeStyle as NativeStyle - -NativeStyle.DefaultTextField { -} diff --git a/src/imports/controls/macos/macos.pri b/src/imports/controls/macos/macos.pri deleted file mode 100644 index 98474a92..00000000 --- a/src/imports/controls/macos/macos.pri +++ /dev/null @@ -1,14 +0,0 @@ -QML_FILES += \ - $$PWD/Button.qml \ - $$PWD/Slider.qml \ - $$PWD/GroupBox.qml \ - $$PWD/CheckBox.qml \ - $$PWD/RadioButton.qml \ - $$PWD/SpinBox.qml \ - $$PWD/TextField.qml \ - $$PWD/Frame.qml \ - $$PWD/TextArea.qml \ - $$PWD/ComboBox.qml \ - $$PWD/ScrollBar.qml \ - $$PWD/ProgressBar.qml \ - $$PWD/Dial.qml \ diff --git a/src/imports/controls/macos/macos.pro b/src/imports/controls/macos/macos.pro deleted file mode 100644 index a190a6d2..00000000 --- a/src/imports/controls/macos/macos.pro +++ /dev/null @@ -1,28 +0,0 @@ -TARGET = qtquickcontrols2macosstyleplugin -TARGETPATH = QtQuick/Controls/macOS - -QML_IMPORT_NAME = QtQuick.Controls.macOS -QML_IMPORT_VERSION = $$QT_VERSION - -QT += qml quick quickcontrols2 quicktemplates2 -QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates2-private quickcontrols2-private - -DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII - -include(macos.pri) - -OTHER_FILES += \ - qmldir \ - $$QML_FILES - -SOURCES += \ - $$PWD/qtquickcontrols2macosstyleplugin.cpp - -CONFIG += no_cxx_module install_qml_files builtin_resources qtquickcompiler -CONFIG += qmltypes install_qmltypes - -load(qml_plugin) - -requires(qtConfig(quickcontrols2-macos)) - -HEADERS += diff --git a/src/imports/controls/macos/qmldir b/src/imports/controls/macos/qmldir deleted file mode 100644 index ea71d8fc..00000000 --- a/src/imports/controls/macos/qmldir +++ /dev/null @@ -1,18 +0,0 @@ -module QtQuick.Controls.macOS -plugin qtquickcontrols2macosstyleplugin -classname QtQuickControls2MacOSStylePlugin -import QtQuick.Controls.Fusion auto - -Button 6.0 Button.qml -CheckBox 6.0 CheckBox.qml -RadioButton 6.0 RadioButton.qml -Slider 6.0 Slider.qml -GroupBox 6.0 GroupBox.qml -SpinBox 6.0 SpinBox.qml -TextField 6.0 TextField.qml -Frame 6.0 Frame.qml -TextArea 6.0 TextArea.qml -ComboBox 6.0 ComboBox.qml -ScrollBar 6.0 ScrollBar.qml -ProgressBar 6.0 ProgressBar.qml -Dial 6.0 Dial.qml diff --git a/src/imports/controls/macos/qtquickcontrols2macosstyleplugin.cpp b/src/imports/controls/macos/qtquickcontrols2macosstyleplugin.cpp deleted file mode 100644 index a6a26b89..00000000 --- a/src/imports/controls/macos/qtquickcontrols2macosstyleplugin.cpp +++ /dev/null @@ -1,65 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2020 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$ -** -****************************************************************************/ - -#include <QtQml/qqml.h> -#include <QtQuickControls2/private/qquickstyleplugin_p.h> -#include <QtQuickControls2/qquickstyle.h> - -QT_BEGIN_NAMESPACE - -class QtQuickControls2MacOSStylePlugin : public QQuickStylePlugin -{ - Q_OBJECT - Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) - -public: - void registerTypes(const char *uri) override; - QString name() const override; -}; - -QString QtQuickControls2MacOSStylePlugin::name() const -{ - return QStringLiteral("macOS"); -} - -void QtQuickControls2MacOSStylePlugin::registerTypes(const char *uri) -{ - QQuickStylePlugin::registerTypes(uri); -} - -QT_END_NAMESPACE - -#include "qtquickcontrols2macosstyleplugin.moc" |