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.h | |
| 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.h')
| -rw-r--r-- | src/qml/qml/qqmlapplicationengine.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlapplicationengine.h b/src/qml/qml/qqmlapplicationengine.h index ff7dce5f8b..e64d7495cd 100644 --- a/src/qml/qml/qqmlapplicationengine.h +++ b/src/qml/qml/qqmlapplicationengine.h @@ -58,7 +58,11 @@ public: QQmlApplicationEngine(const QString &filePath, QObject *parent = Q_NULLPTR); ~QQmlApplicationEngine(); - QList<QObject*> rootObjects(); +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + QList<QObject*> rootObjects(); // ### Qt 6: remove +#endif + QList<QObject*> rootObjects() const; + public Q_SLOTS: void load(const QUrl &url); void load(const QString &filePath); |