diff options
Diffstat (limited to 'src/qml/qml/qqmlapplicationengine_p.h')
-rw-r--r-- | src/qml/qml/qqmlapplicationengine_p.h | 47 |
1 files changed, 7 insertions, 40 deletions
diff --git a/src/qml/qml/qqmlapplicationengine_p.h b/src/qml/qml/qqmlapplicationengine_p.h index d944dd25b3..df99783e0a 100644 --- a/src/qml/qml/qqmlapplicationengine_p.h +++ b/src/qml/qml/qqmlapplicationengine_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Research In Motion. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtQml 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 Research In Motion. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QQMLAPPLICATIONENGINE_P_H #define QQMLAPPLICATIONENGINE_P_H @@ -60,24 +24,27 @@ QT_BEGIN_NAMESPACE class QFileSelector; -class Q_QML_PRIVATE_EXPORT QQmlApplicationEnginePrivate : public QQmlEnginePrivate +class Q_QML_EXPORT QQmlApplicationEnginePrivate : public QQmlEnginePrivate { Q_DECLARE_PUBLIC(QQmlApplicationEngine) public: QQmlApplicationEnginePrivate(QQmlEngine *e); ~QQmlApplicationEnginePrivate(); + void ensureInitialized(); void init(); void cleanUp(); void startLoad(const QUrl &url, const QByteArray &data = QByteArray(), bool dataFlag = false); + void startLoad(QAnyStringView uri, QAnyStringView type); void _q_loadTranslations(); void finishLoad(QQmlComponent *component); + void ensureLoadingFinishes(QQmlComponent *component); QList<QObject *> objects; QVariantMap initialProperties; QStringList extraFileSelectors; QString translationsDirectory; #if QT_CONFIG(translation) - QScopedPointer<QTranslator> activeTranslator; + std::unique_ptr<QTranslator> activeTranslator; #endif bool isInitialized = false; }; |