Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00
Code Releases Activity

WebPage: Use load finished workaround unconditionally

Browse Source 
It seems to be broken, again, with QtWebEngine 5.11.

BUG: 392885
FIXED-IN: 3.0.1
This commit is contained in:
David Rosca 2018-04-11 18:32:12 +02:00
parent 63f5fdd3d7
commit 17d45d718c
No known key found for this signature in database
GPG Key ID: EBC3FC294452C6D8
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lib/webengine/webpage.cpp
View File

@ -99,14 +99,12 @@ WebPage::WebPage(QObject* parent)
disconnect(m_contentsResizedConnection); disconnect(m_contentsResizedConnection);
}); });
// Workaround for broken load started/finished signals in QtWebEngine 5.10 // Workaround for broken load started/finished signals in QtWebEngine 5.10, 5.11
if (qstrncmp(qVersion(), "5.10.", 5) == 0) { connect(this, &QWebEnginePage::loadProgress, this, [this](int progress) {
connect(this, &QWebEnginePage::loadProgress, this, [this](int progress) { if (progress == 100) {
if (progress == 100) { emit loadFinished(true);
emit loadFinished(true); }
} });
});
}
// Workaround for changing webchannel world inside acceptNavigationRequest not working // Workaround for changing webchannel world inside acceptNavigationRequest not working
m_setupChannelTimer = new QTimer(this); m_setupChannelTimer = new QTimer(this);