diff options
Diffstat (limited to 'src/quick/items/qquickwindow.h')
| -rw-r--r-- | src/quick/items/qquickwindow.h | 58 |
1 files changed, 18 insertions, 40 deletions
diff --git a/src/quick/items/qquickwindow.h b/src/quick/items/qquickwindow.h index cd39bc13d3..17c4bb6fd4 100644 --- a/src/quick/items/qquickwindow.h +++ b/src/quick/items/qquickwindow.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtQuick module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 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 -** 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 -** Public license version 3 or any later version approved by the KDE Free -** 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 -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** 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 QQUICKWINDOW_H #define QQUICKWINDOW_H @@ -65,9 +29,14 @@ class QQuickRenderControl; class QSGRectangleNode; class QSGImageNode; class QSGNinePatchNode; +class QQuickPalette; class QQuickRenderTarget; class QQuickGraphicsDevice; class QQuickGraphicsConfiguration; +class QRhi; +class QRhiSwapChain; +class QRhiTexture; +class QSGTextNode; class Q_QUICK_EXPORT QQuickWindow : public QWindow { @@ -76,6 +45,8 @@ class Q_QUICK_EXPORT QQuickWindow : public QWindow Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged) Q_PROPERTY(QQuickItem* contentItem READ contentItem CONSTANT) Q_PROPERTY(QQuickItem* activeFocusItem READ activeFocusItem NOTIFY activeFocusItemChanged REVISION(2, 1)) + Q_PRIVATE_PROPERTY(QQuickWindow::d_func(), QQuickPalette *palette READ palette WRITE setPalette + RESET resetPalette NOTIFY paletteChanged REVISION(6, 2)) QDOC_PROPERTY(QWindow* transientParent READ transientParent WRITE setTransientParent NOTIFY transientParentChanged) Q_CLASSINFO("DefaultProperty", "data") Q_DECLARE_PRIVATE(QQuickWindow) @@ -111,7 +82,8 @@ public: enum TextRenderType { QtTextRendering, - NativeTextRendering + NativeTextRendering, + CurveTextRendering }; Q_ENUM(TextRenderType) @@ -148,6 +120,7 @@ public: // Scene graph specific functions QSGTexture *createTextureFromImage(const QImage &image) const; QSGTexture *createTextureFromImage(const QImage &image, CreateTextureOptions options) const; + QSGTexture *createTextureFromRhiTexture(QRhiTexture *texture, CreateTextureOptions options = {}) const; void setColor(const QColor &color); QColor color() const; @@ -184,10 +157,14 @@ public: QSGRectangleNode *createRectangleNode() const; QSGImageNode *createImageNode() const; QSGNinePatchNode *createNinePatchNode() const; + QSGTextNode *createTextNode() const; static TextRenderType textRenderType(); static void setTextRenderType(TextRenderType renderType); + QRhi *rhi() const; + QRhiSwapChain *swapChain() const; + Q_SIGNALS: void frameSwapped(); void sceneGraphInitialized(); @@ -253,9 +230,9 @@ private Q_SLOTS: void cleanupSceneGraph(); void physicalDpiChanged(); void handleScreenChanged(QScreen *screen); - void setTransientParent_helper(QQuickWindow *window); void runJobsAfterSwap(); void handleApplicationStateChanged(Qt::ApplicationState state); + void handleFontDatabaseChanged(); private: #ifndef QT_NO_DEBUG_STREAM inline friend QQmlInfo operator<<(QQmlInfo info, const QQuickWindow *window) @@ -266,6 +243,7 @@ private: #endif friend class QQuickItem; + friend class QQuickItemPrivate; friend class QQuickWidget; friend class QQuickRenderControl; friend class QQuickAnimatorController; |