diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-10 01:00:05 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-10 01:00:05 +0200 |
| commit | 1fa23b42b512d90eb4c70372f9723eda16f0f330 (patch) | |
| tree | dc0391dfe2fd7b90478dd8c208ff353b7cc77078 /src/qml/qml/qqmlengine.cpp | |
| parent | f257be627cc9de4fdec430e2fe8f6ac3b6827070 (diff) | |
| parent | 51b73e0bb68812d78315af032546750d04656c02 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ie296f843c70921722c935b8a5ebdcc66b3b2db9c
Diffstat (limited to 'src/qml/qml/qqmlengine.cpp')
| -rw-r--r-- | src/qml/qml/qqmlengine.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index 92f46004ee..b72e07d97b 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -2005,11 +2005,6 @@ void QQmlEnginePrivate::warning(const QList<QQmlError> &errors) dumpwarning(errors); } -void QQmlEnginePrivate::warning(QQmlDelayedError *error) -{ - warning(error->error()); -} - void QQmlEnginePrivate::warning(QQmlEngine *engine, const QQmlError &error) { if (engine) @@ -2026,14 +2021,6 @@ void QQmlEnginePrivate::warning(QQmlEngine *engine, const QList<QQmlError> &erro dumpwarning(error); } -void QQmlEnginePrivate::warning(QQmlEngine *engine, QQmlDelayedError *error) -{ - if (engine) - QQmlEnginePrivate::get(engine)->warning(error); - else - dumpwarning(error->error()); -} - void QQmlEnginePrivate::warning(QQmlEnginePrivate *engine, const QQmlError &error) { if (engine) |