diff options
Diffstat (limited to 'src/qml/qml/qqmlfileselector.cpp')
| -rw-r--r-- | src/qml/qml/qqmlfileselector.cpp | 54 |
1 files changed, 8 insertions, 46 deletions
diff --git a/src/qml/qml/qqmlfileselector.cpp b/src/qml/qml/qqmlfileselector.cpp index 4b773adc3e..1704e2d994 100644 --- a/src/qml/qml/qqmlfileselector.cpp +++ b/src/qml/qml/qqmlfileselector.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 BlackBerry Limited. All rights reserved. -** 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 BlackBerry Limited. All rights reserved. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include <QtCore/QFileSelector> #include <QtQml/QQmlAbstractUrlInterceptor> @@ -90,8 +54,7 @@ QT_BEGIN_NAMESPACE directories used for selection must start with a '+' character, so you will not accidentally trigger this feature unless you have directories with such names inside your project. - If a new QQmlFileSelector is set on the engine, the old one will be replaced. Use - \l QQmlFileSelector::get() to query or use the existing instance. + If a new QQmlFileSelector is set on the engine, the old one will be replaced. */ /*! @@ -147,7 +110,7 @@ QQmlFileSelectorPrivate::~QQmlFileSelectorPrivate() /*! Sets the QFileSelector instance for use by the QQmlFileSelector to \a selector. QQmlFileSelector does not take ownership of the new QFileSelector. To reset QQmlFileSelector - to use its internal QFileSelector instance, call setSelector(0). + to use its internal QFileSelector instance, call setSelector(\nullptr). */ void QQmlFileSelector::setSelector(QFileSelector *selector) @@ -180,7 +143,9 @@ void QQmlFileSelector::setExtraSelectors(const QStringList &strings) #if QT_DEPRECATED_SINCE(6, 0) /*! - \deprecated + \deprecated [6.0] The file selector should not be accessed after it + is set. It may be in use. See below for further details. + Gets the QQmlFileSelector currently active on the target \a engine. This method is deprecated. You should not retrieve the files selector from an @@ -198,10 +163,7 @@ QQmlFileSelector* QQmlFileSelector::get(QQmlEngine* engine) if (qobject_cast<QQmlApplicationEngine *>(engine)) { auto *appEnginePrivate = static_cast<QQmlApplicationEnginePrivate *>(enginePrivate); - if (!appEnginePrivate->isInitialized) { - appEnginePrivate->init(); - appEnginePrivate->isInitialized = true; - } + appEnginePrivate->ensureInitialized(); } const QUrl nonEmptyInvalid(QLatin1String(":")); |