diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2020-02-07 15:29:43 +0100 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-02-12 15:39:56 +0100 |
commit | 8d634b512712a1cc7969ffc94a399dca233e4535 (patch) | |
tree | dfc55eb5c5460101c618e2c9ce081c9c6593c211 /src/qml/qml/qqmlengine.h | |
parent | 0521b55f201299ee9f031f61d5bf8f2be18cf8c5 (diff) |
Remove BC shim for QQmlEngine::addNamedBundle()
Unfortunately we failed to deprecated it in Qt5, but now we can provide
it inline.
Change-Id: I89e418829ce08e7d0da68e91106ba12a24c8b02a
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlengine.h')
-rw-r--r-- | src/qml/qml/qqmlengine.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlengine.h b/src/qml/qml/qqmlengine.h index 31fe3a1849..a686d8a1d9 100644 --- a/src/qml/qml/qqmlengine.h +++ b/src/qml/qml/qqmlengine.h @@ -112,7 +112,9 @@ public: void setPluginPathList(const QStringList &paths); void addPluginPath(const QString& dir); - bool addNamedBundle(const QString &name, const QString &fileName); +#if QT_DEPRECATED_SINCE(6, 0) + QT_DEPRECATED bool addNamedBundle(const QString &, const QString &) { return false; } +#endif #if QT_CONFIG(library) bool importPlugin(const QString &filePath, const QString &uri, QList<QQmlError> *errors); |