diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-01-18 15:40:56 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2021-01-19 23:13:47 +0100 |
| commit | a7510e85e6f53f4e889307edb58f26c8900d2d06 (patch) | |
| tree | d4b6208bb8bf7d8288c57d7024c2813b3af1b5aa /src/core/api/qwebenginepage.cpp | |
| parent | 91696b2cb090e5b6147a30465f74d8d37db48615 (diff) | |
| parent | f1f763cf3c7254406b7b6f01551b6624210bb834 (diff) | |
Merge branch '5.15' into dev
Last commits before 87 update.
Change-Id: Id156b0199a8fd354c946cfe604ae8541ba554658
Diffstat (limited to 'src/core/api/qwebenginepage.cpp')
| -rw-r--r-- | src/core/api/qwebenginepage.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/core/api/qwebenginepage.cpp b/src/core/api/qwebenginepage.cpp index aad929611..aa3fba24e 100644 --- a/src/core/api/qwebenginepage.cpp +++ b/src/core/api/qwebenginepage.cpp @@ -313,7 +313,6 @@ void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isE Q_UNUSED(errorDescription); if (isErrorPage) { - Q_ASSERT(settings->testAttribute(QWebEngineSettings::ErrorPageEnabled)); QTimer::singleShot(0, q, [q](){ emit q->loadFinished(false); }); |