diff options
Diffstat (limited to 'src/qml/qml/qqmlvme.cpp')
| -rw-r--r-- | src/qml/qml/qqmlvme.cpp | 65 |
1 files changed, 5 insertions, 60 deletions
diff --git a/src/qml/qml/qqmlvme.cpp b/src/qml/qml/qqmlvme.cpp index cf073dc768..3b9bf80940 100644 --- a/src/qml/qml/qqmlvme.cpp +++ b/src/qml/qml/qqmlvme.cpp @@ -1,67 +1,12 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** 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 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 "qqmlvme_p.h" -#include "qqmlboundsignal_p.h" -#include "qqmlstringconverters_p.h" #include <private/qmetaobjectbuilder_p.h> -#include "qqmldata_p.h" -#include "qqml.h" -#include "qqmlinfo.h" -#include "qqmlcustomparser_p.h" #include "qqmlengine.h" -#include "qqmlcontext.h" -#include "qqmlcomponent.h" -#include "qqmlcomponentattached_p.h" -#include "qqmlbinding_p.h" -#include "qqmlengine_p.h" -#include "qqmlcomponent_p.h" -#include "qqmlvmemetaobject_p.h" -#include "qqmlcontext_p.h" -#include "qqmlglobal_p.h" #include <private/qfinitestack_p.h> -#include "qqmlscriptstring.h" -#include "qqmlscriptstring_p.h" -#include "qqmlpropertyvalueinterceptor_p.h" -#include "qqmlvaluetypeproxybinding_p.h" -#include "qqmlexpression_p.h" +#include <QtQml/private/qqmlcomponent_p.h> #include <QStack> #include <QPointF> @@ -107,9 +52,9 @@ void QQmlVMEGuard::guard(QQmlObjectCreator *creator) { clear(); - QFiniteStack<QPointer<QObject> > &objects = creator->allCreatedObjects(); + QFiniteStack<QQmlGuard<QObject> > &objects = creator->allCreatedObjects(); m_objectCount = objects.count(); - m_objects = new QPointer<QObject>[m_objectCount]; + m_objects = new QQmlGuard<QObject>[m_objectCount]; for (int ii = 0; ii < m_objectCount; ++ii) m_objects[ii] = objects[ii]; |