From 8d634b512712a1cc7969ffc94a399dca233e4535 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Fri, 7 Feb 2020 15:29:43 +0100 Subject: 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 --- src/qml/qml/qqmlengine.cpp | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'src/qml/qml/qqmlengine.cpp') diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index b16bc929c9..c67e091518 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -2301,17 +2301,6 @@ QString QQmlEngine::offlineStorageDatabaseFilePath(const QString &databaseName) return d->offlineStorageDatabaseDirectory() + QLatin1String(md5.result().toHex()); } -// #### Qt 6: Remove this function, it exists only for binary compatibility. -/*! - * \internal - */ -bool QQmlEngine::addNamedBundle(const QString &name, const QString &fileName) -{ - Q_UNUSED(name) - Q_UNUSED(fileName) - return false; -} - QString QQmlEnginePrivate::offlineStorageDatabaseDirectory() const { Q_Q(const QQmlEngine); -- cgit v1.2.3