diff options
Diffstat (limited to 'src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.h')
-rw-r--r-- | src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.h | 53 |
1 files changed, 7 insertions, 46 deletions
diff --git a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.h b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.h index 47491b9d8f..e273b22fa7 100644 --- a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.h +++ b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QML preview debug service. -** -** $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) 2018 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 QQMLPREVIEWHANDLER_H #define QQMLPREVIEWHANDLER_H @@ -66,7 +30,6 @@ class QQmlEngine; class QQuickItem; class QQmlPreviewUrlInterceptor; class QQuickWindow; -class QTranslator; class QQmlPreviewHandler : public QObject { @@ -75,13 +38,14 @@ public: explicit QQmlPreviewHandler(QObject *parent = nullptr); ~QQmlPreviewHandler(); + QQuickItem *currentRootItem(); + void addEngine(QQmlEngine *engine); void removeEngine(QQmlEngine *engine); void loadUrl(const QUrl &url); void rerun(); void zoom(qreal newFactor); - void language(const QUrl &context, const QLocale &locale); void clear(); @@ -97,12 +61,12 @@ public: quint16 totalRender; }; -signals: +Q_SIGNALS: void error(const QString &message); void fps(const FpsInfo &info); protected: - bool eventFilter(QObject *obj, QEvent *event); + bool eventFilter(QObject *obj, QEvent *event) override; private: void doZoom(); void tryCreateObject(); @@ -115,10 +79,10 @@ private: void frameSwapped(); void fpsTimerHit(); - void removeTranslators(); QScopedPointer<QQuickItem> m_dummyItem; QList<QQmlEngine *> m_engines; + QPointer<QQuickItem> m_currentRootItem; QVector<QPointer<QObject>> m_createdObjects; QScopedPointer<QQmlComponent> m_component; QPointer<QQuickWindow> m_currentWindow; @@ -144,9 +108,6 @@ private: FrameTime m_rendering; FrameTime m_synchronizing; - - QScopedPointer<QTranslator> m_qtTranslator; - QScopedPointer<QTranslator> m_qmlTranslator; }; QT_END_NAMESPACE |