diff options
author | Anton Kudryavtsev <a.kudryavtsev@netris.ru> | 2016-10-10 15:03:01 +0300 |
---|---|---|
committer | Anton Kudryavtsev <a.kudryavtsev@netris.ru> | 2016-10-13 17:12:16 +0000 |
commit | 2fecb343c2812d2f7e0fe705074401f3fb152279 (patch) | |
tree | fdcb2c7f0d9a7c1d0f1657cf0e64da8f990af30c /src/qml/qml/qqmlapplicationengine.cpp | |
parent | eff37a46ce33078f6f601bd724bbb7359b5db055 (diff) |
QQmlApplicationEngine: mark rootObjects() as const
This method does not modify the object.
Can't change the API, so overload and mark the old function
for removal in Qt 6.
Change-Id: I15943c770b30460f8ccd14239526e2249c59a242
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlapplicationengine.cpp')
-rw-r--r-- | src/qml/qml/qqmlapplicationengine.cpp | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlapplicationengine.cpp b/src/qml/qml/qqmlapplicationengine.cpp index fef2da753b..1a912d53e6 100644 --- a/src/qml/qml/qqmlapplicationengine.cpp +++ b/src/qml/qml/qqmlapplicationengine.cpp @@ -287,14 +287,27 @@ void QQmlApplicationEngine::loadData(const QByteArray &data, const QUrl &url) Returns a list of all the root objects instantiated by the QQmlApplicationEngine. This will only contain objects loaded via load() or a convenience constructor. + + \note In Qt versions prior to 5.9, this function is marked as non-\c{const}. */ -QList<QObject *> QQmlApplicationEngine::rootObjects() +QList<QObject *> QQmlApplicationEngine::rootObjects() const { - Q_D(QQmlApplicationEngine); + Q_D(const QQmlApplicationEngine); return d->objects; } +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) +/*! + \overload + \internal +*/ +QList<QObject *> QQmlApplicationEngine::rootObjects() +{ + return qAsConst(*this).rootObjects(); +} +#endif // < Qt 6 + QT_END_NAMESPACE #include "moc_qqmlapplicationengine.cpp" |