diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-07-10 10:28:39 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-07-14 00:46:40 +0200 |
| commit | e608536f45fd435df092caa9fd78adf8651abdc1 (patch) | |
| tree | 202931ce3adb51b5b1323ded0e0e910d9b78e3a5 | |
| parent | 9cfde2edf4736ae9533e7e1fac495a23ad905419 (diff) | |
| parent | b3ff7eef14ed3fb48bef06abff31a272d0bc8915 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into dev"
| -rw-r--r-- | src/core/compositor/compositor_resource_tracker.cpp | 3 | ||||
| -rw-r--r-- | src/core/profile_adapter.cpp | 8 | ||||
| -rw-r--r-- | src/webengine/doc/qtwebengine.qdocconf | 1 | ||||
| -rw-r--r-- | tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp | 3 |
4 files changed, 11 insertions, 4 deletions
diff --git a/src/core/compositor/compositor_resource_tracker.cpp b/src/core/compositor/compositor_resource_tracker.cpp index 73242c693..741c2717c 100644 --- a/src/core/compositor/compositor_resource_tracker.cpp +++ b/src/core/compositor/compositor_resource_tracker.cpp @@ -174,7 +174,8 @@ quint32 CompositorResourceTracker::consumeMailbox(const gpu::MailboxHolder &mail DCHECK(mailboxManager); if (mailboxHolder.sync_token.HasData()) mailboxManager->PullTextureUpdates(mailboxHolder.sync_token); - return service_id(mailboxManager->ConsumeTexture(mailboxHolder.mailbox)); + gpu::TextureBase *tex = mailboxManager->ConsumeTexture(mailboxHolder.mailbox); + return tex ? service_id(tex) : 0; #else NOTREACHED(); #endif // QT_CONFIG(OPENGL) diff --git a/src/core/profile_adapter.cpp b/src/core/profile_adapter.cpp index fdbdbfdcb..551663cf0 100644 --- a/src/core/profile_adapter.cpp +++ b/src/core/profile_adapter.cpp @@ -438,7 +438,7 @@ void ProfileAdapter::setHttpCacheMaxSize(int maxSize) m_profile->m_profileIOData->updateHttpCache(); } -enum class SchemeType { Protected, Overridable, Custom }; +enum class SchemeType { Protected, Overridable, Custom, Unknown }; static SchemeType schemeType(const QByteArray &canonicalScheme) { static const QSet<QByteArray> blacklist{ @@ -463,7 +463,9 @@ static SchemeType schemeType(const QByteArray &canonicalScheme) return SchemeType::Overridable; if (blacklisted || (standardSyntax && !customScheme)) return SchemeType::Protected; - return SchemeType::Custom; + if (customScheme) + return SchemeType::Custom; + return SchemeType::Unknown; } QWebEngineUrlSchemeHandler *ProfileAdapter::urlSchemeHandler(const QByteArray &scheme) @@ -530,7 +532,7 @@ void ProfileAdapter::installUrlSchemeHandler(const QByteArray &scheme, QWebEngin return; } - if (type == SchemeType::Custom) + if (type == SchemeType::Unknown) qWarning("Please register the custom scheme '%s' via QWebEngineUrlScheme::registerScheme() " "before installing the custom scheme handler.", scheme.constData()); diff --git a/src/webengine/doc/qtwebengine.qdocconf b/src/webengine/doc/qtwebengine.qdocconf index 50f2e2ceb..d84e41c5a 100644 --- a/src/webengine/doc/qtwebengine.qdocconf +++ b/src/webengine/doc/qtwebengine.qdocconf @@ -1,4 +1,5 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) +include($QT_INSTALL_DOCS/config/exampleurl-qtwebengine.qdocconf) project = QtWebEngine description = Qt WebEngine Reference Documentation diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp index 27f2a9c2b..8fb7e05ca 100644 --- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp +++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp @@ -1709,12 +1709,15 @@ void tst_QWebEnginePage::runJavaScriptFromSlot() { QWebEngineProfile profile; QWebEnginePage page(&profile); + page.settings()->setAttribute(QWebEngineSettings::FocusOnNavigationEnabled, true); QSignalSpy loadFinishedSpy(&page, &QWebEnginePage::loadFinished); page.setHtml("<html><body>" " <input type='text' id='input1' value='QtWebEngine' size='50' />" "</body></html>"); QTRY_COMPARE(loadFinishedSpy.count(), 1); + // Workaround for QTBUG-74718 + QTRY_VERIFY(page.action(QWebEnginePage::SelectAll)->isEnabled()); QVariant result(-1); connect(&page, &QWebEnginePage::selectionChanged, [&]() { |