From 4ca48ee2eb3f49f0b72e60dd08aa3765568e8823 Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Tue, 28 Jul 2020 14:53:16 +0200 Subject: Native style: remove fusiondesktop This style is not needed, since the already existing fusion style is working also for desktop. Change-Id: I0f92fdb88dc6173530be0f33b98a6f2d97e65afb Reviewed-by: Mitch Curtis --- src/imports/controls/fusiondesktop/Button.qml | 43 -------------- src/imports/controls/fusiondesktop/GroupBox.qml | 43 -------------- src/imports/controls/fusiondesktop/Slider.qml | 43 -------------- .../controls/fusiondesktop/fusiondesktop.pri | 4 -- .../controls/fusiondesktop/fusiondesktop.pro | 29 ---------- src/imports/controls/fusiondesktop/qmldir | 4 -- .../qtquickcontrols2fusiondesktopstyleplugin.cpp | 65 ---------------------- src/imports/imports.pro | 1 - 8 files changed, 232 deletions(-) delete mode 100644 src/imports/controls/fusiondesktop/Button.qml delete mode 100644 src/imports/controls/fusiondesktop/GroupBox.qml delete mode 100644 src/imports/controls/fusiondesktop/Slider.qml delete mode 100644 src/imports/controls/fusiondesktop/fusiondesktop.pri delete mode 100644 src/imports/controls/fusiondesktop/fusiondesktop.pro delete mode 100644 src/imports/controls/fusiondesktop/qmldir delete mode 100644 src/imports/controls/fusiondesktop/qtquickcontrols2fusiondesktopstyleplugin.cpp diff --git a/src/imports/controls/fusiondesktop/Button.qml b/src/imports/controls/fusiondesktop/Button.qml deleted file mode 100644 index 7db1f9ed..00000000 --- a/src/imports/controls/fusiondesktop/Button.qml +++ /dev/null @@ -1,43 +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 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.NativeStyle 6.0 as NativeStyle - -NativeStyle.DefaultButton { -} diff --git a/src/imports/controls/fusiondesktop/GroupBox.qml b/src/imports/controls/fusiondesktop/GroupBox.qml deleted file mode 100644 index 45911ba1..00000000 --- a/src/imports/controls/fusiondesktop/GroupBox.qml +++ /dev/null @@ -1,43 +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 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.NativeStyle 6.0 as NativeStyle - -NativeStyle.DefaultGroupBox { -} diff --git a/src/imports/controls/fusiondesktop/Slider.qml b/src/imports/controls/fusiondesktop/Slider.qml deleted file mode 100644 index 3aed431f..00000000 --- a/src/imports/controls/fusiondesktop/Slider.qml +++ /dev/null @@ -1,43 +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 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.impl 2.12 -import QtQuick.NativeStyle 6.0 as NativeStyle - -NativeStyle.DefaultSlider { -} diff --git a/src/imports/controls/fusiondesktop/fusiondesktop.pri b/src/imports/controls/fusiondesktop/fusiondesktop.pri deleted file mode 100644 index 17db019a..00000000 --- a/src/imports/controls/fusiondesktop/fusiondesktop.pri +++ /dev/null @@ -1,4 +0,0 @@ -QML_FILES += \ - $$PWD/Button.qml \ - $$PWD/Slider.qml \ - $$PWD/GroupBox.qml \ diff --git a/src/imports/controls/fusiondesktop/fusiondesktop.pro b/src/imports/controls/fusiondesktop/fusiondesktop.pro deleted file mode 100644 index bf3a9961..00000000 --- a/src/imports/controls/fusiondesktop/fusiondesktop.pro +++ /dev/null @@ -1,29 +0,0 @@ -TARGET = qtquickcontrols2fusiondesktopstyleplugin -TARGETPATH = QtQuick/Controls.2/FusionDesktop - -QML_IMPORT_NAME = QtQuick.Controls.FusionDesktop -QML_IMPORT_MAJOR_VERSION = 6 - -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(fusiondesktop.pri) - -OTHER_FILES += \ - qmldir \ - $$QML_FILES - -SOURCES += \ - $$PWD/qtquickcontrols2fusiondesktopstyleplugin.cpp - -CONFIG += no_cxx_module install_qml_files builtin_resources qtquickcompiler -CONFIG += qmltypes install_qmltypes - -load(qml_plugin) - -# TODO: add config flag -#requires(qtConfig(quickcontrols2-nativestyle)) - -HEADERS += diff --git a/src/imports/controls/fusiondesktop/qmldir b/src/imports/controls/fusiondesktop/qmldir deleted file mode 100644 index 8d16d743..00000000 --- a/src/imports/controls/fusiondesktop/qmldir +++ /dev/null @@ -1,4 +0,0 @@ -module QtQuick.Controls.FusionDesktop -plugin qtquickcontrols2fusiondesktopstyleplugin -classname QtQuickControls2FusionDesktopStylePlugin -depends QtQuick.Controls 2.5 diff --git a/src/imports/controls/fusiondesktop/qtquickcontrols2fusiondesktopstyleplugin.cpp b/src/imports/controls/fusiondesktop/qtquickcontrols2fusiondesktopstyleplugin.cpp deleted file mode 100644 index 1b85f7ff..00000000 --- a/src/imports/controls/fusiondesktop/qtquickcontrols2fusiondesktopstyleplugin.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 -#include -#include - -QT_BEGIN_NAMESPACE - -class QtQuickControls2WindowsStylePlugin : public QQuickStylePlugin -{ - Q_OBJECT - Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) - -public: - void registerTypes(const char *uri) override; - QString name() const override; -}; - -QString QtQuickControls2WindowsStylePlugin::name() const -{ - return QStringLiteral("FusionDesktop"); -} - -void QtQuickControls2WindowsStylePlugin::registerTypes(const char *uri) -{ - Q_UNUSED(uri); -} - -QT_END_NAMESPACE - -#include "qtquickcontrols2fusiondesktopstyleplugin.moc" diff --git a/src/imports/imports.pro b/src/imports/imports.pro index b304b7ce..40787b8d 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -13,5 +13,4 @@ SUBDIRS += \ macos: SUBDIRS += controls/macos/macos.pro win32: SUBDIRS += controls/windows/windows.pro -unix: SUBDIRS += controls/fusiondesktop/fusiondesktop.pro -- cgit v1.2.3