diff options
author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-10-07 17:38:05 +0300 |
---|---|---|
committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-10-07 17:44:32 +0300 |
commit | 183d0101f41fd5a1007708a9416d1f12db31c1cb (patch) | |
tree | 969a5e91aef3b4c6805331e56c24fa6be8738f6b /examples/webenginewidgets/recipebrowser | |
parent | 17e9f29577ea6573c7c348083ff510ee60c7e8cc (diff) | |
parent | 13381ca9e80578d038835c8a4dc609d75dfdec4c (diff) |
Merge tag 'v6.2.10-lts' into tqtc/lts-6.2-opensourcev6.2.10-lts-lgpl6.2.10
Qt 6.2.10-lts release
Conflicts solved:
CHROMIUM_VERSION
dependencies.yaml
src/core/web_engine_context.cpp
Change-Id: Ia54316ba0df3488d8e13c8f14fead1d90099519b
Diffstat (limited to 'examples/webenginewidgets/recipebrowser')
-rw-r--r-- | examples/webenginewidgets/recipebrowser/doc/src/recipebrowser.qdoc | 2 | ||||
-rw-r--r-- | examples/webenginewidgets/recipebrowser/mainwindow.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/examples/webenginewidgets/recipebrowser/doc/src/recipebrowser.qdoc b/examples/webenginewidgets/recipebrowser/doc/src/recipebrowser.qdoc index dd701f1f2..0400fcecc 100644 --- a/examples/webenginewidgets/recipebrowser/doc/src/recipebrowser.qdoc +++ b/examples/webenginewidgets/recipebrowser/doc/src/recipebrowser.qdoc @@ -4,11 +4,11 @@ /*! \example webenginewidgets/recipebrowser \title Recipe Browser - \examplecategory {Application Examples} \meta tag {widgets, webengine, webchannel, webenginescript} \ingroup webengine-widgetexamples \brief Injecting custom stylsheets into web pages and providing a rich text preview tool for a custom markup language. + \examplecategory {Web Technologies} \image recipebrowser.webp diff --git a/examples/webenginewidgets/recipebrowser/mainwindow.cpp b/examples/webenginewidgets/recipebrowser/mainwindow.cpp index 7288fe4ce..79cd3bb6b 100644 --- a/examples/webenginewidgets/recipebrowser/mainwindow.cpp +++ b/examples/webenginewidgets/recipebrowser/mainwindow.cpp @@ -122,8 +122,7 @@ void MainWindow::loadDefaultStyleSheets() settings.beginGroup("styleSheets"); for (auto it = defaultStyleSheets.constBegin(); it != defaultStyleSheets.constEnd(); ++it) { - settings.setValue(it.key(), QVariant::fromValue(qMakePair(it.value(), true))); - insertStyleSheet(it.key(), it.value(), false); + settings.setValue(it.key(), QVariant::fromValue(qMakePair(it.value(), false))); } settings.endGroup(); |