diff options
Diffstat (limited to 'src/designer/src/plugins/qquickwidget')
4 files changed, 13 insertions, 71 deletions
diff --git a/src/designer/src/plugins/qquickwidget/CMakeLists.txt b/src/designer/src/plugins/qquickwidget/CMakeLists.txt index 66d68c256..1832a4e49 100644 --- a/src/designer/src/plugins/qquickwidget/CMakeLists.txt +++ b/src/designer/src/plugins/qquickwidget/CMakeLists.txt @@ -1,4 +1,5 @@ -# Generated from qquickwidget.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## QQuickWidgetPlugin Plugin: diff --git a/src/designer/src/plugins/qquickwidget/qquickwidget_plugin.cpp b/src/designer/src/plugins/qquickwidget/qquickwidget_plugin.cpp index cce05023a..cfdf9d0e4 100644 --- a/src/designer/src/plugins/qquickwidget/qquickwidget_plugin.cpp +++ b/src/designer/src/plugins/qquickwidget/qquickwidget_plugin.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Designer of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** 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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qquickwidget_plugin.h" @@ -40,6 +15,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + QQuickWidgetPlugin::QQuickWidgetPlugin(QObject *parent) : QObject(parent) { @@ -47,17 +24,17 @@ QQuickWidgetPlugin::QQuickWidgetPlugin(QObject *parent) QString QQuickWidgetPlugin::name() const { - return QStringLiteral("QQuickWidget"); + return u"QQuickWidget"_s; } QString QQuickWidgetPlugin::group() const { - return QStringLiteral("Display Widgets"); + return u"Display Widgets"_s; } QString QQuickWidgetPlugin::toolTip() const { - return QStringLiteral("A widget for displaying a Qt Quick 2 user interface."); + return u"A widget for displaying a Qt Quick 2 user interface."_s; } QString QQuickWidgetPlugin::whatsThis() const @@ -67,12 +44,12 @@ QString QQuickWidgetPlugin::whatsThis() const QString QQuickWidgetPlugin::includeFile() const { - return QStringLiteral("<QtQuickWidgets/QQuickWidget>"); + return u"<QtQuickWidgets/QQuickWidget>"_s; } QIcon QQuickWidgetPlugin::icon() const { - return QIcon(QStringLiteral(":/qt-project.org/qquickwidget/images/qquickwidget.png")); + return QIcon(u":/qt-project.org/qquickwidget/images/qquickwidget.png"_s); } bool QQuickWidgetPlugin::isContainer() const @@ -103,12 +80,6 @@ void QQuickWidgetPlugin::initialize(QDesignerFormEditorInterface * /*core*/) QString QQuickWidgetPlugin::domXml() const { - const auto graphicsApi = QQuickWindow::graphicsApi(); - if (graphicsApi != QSGRendererInterface::OpenGLRhi) { - qWarning("Qt Designer: The QQuickWidget custom widget plugin is disabled because it requires OpenGL RHI (current: %d).", - int(graphicsApi)); - return {}; - } return QStringLiteral(R"( <ui language="c++"> <widget class="QQuickWidget" name="quickWidget"> diff --git a/src/designer/src/plugins/qquickwidget/qquickwidget_plugin.h b/src/designer/src/plugins/qquickwidget/qquickwidget_plugin.h index 009492547..464deb361 100644 --- a/src/designer/src/plugins/qquickwidget/qquickwidget_plugin.h +++ b/src/designer/src/plugins/qquickwidget/qquickwidget_plugin.h @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Designer of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** 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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QQUICKWIDGET_PLUGIN_H #define QQUICKWIDGET_PLUGIN_H diff --git a/src/designer/src/plugins/qquickwidget/qquickwidget_plugin.qrc b/src/designer/src/plugins/qquickwidget/qquickwidget_plugin.qrc deleted file mode 100644 index e518aa2d9..000000000 --- a/src/designer/src/plugins/qquickwidget/qquickwidget_plugin.qrc +++ /dev/null @@ -1,5 +0,0 @@ -<RCC> - <qresource prefix="/qt-project.org/qquickwidget"> - <file>images/qquickwidget.png</file> - </qresource> -</RCC> |