summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorBalazs Egedi <egedib@inf.u-szeged.hu>2021-07-14 14:27:28 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-08-05 12:38:26 +0000
commit5e470455cfb862e9c5d5816a589e45a39a308df2 (patch)
treeb1087bed134a729dda878ed74792543b7c9dfce1 /examples
parent55436833985607f10054845d82b5253838a067e1 (diff)
Implement QML Color Dialog
Quick Controls 2 does not contain Color Dialog, the Labs version does not run on every OS. Task-number: QTBUG-93666 Change-Id: Idfb1fd017a7f7b74c4ad135575a9727607dacac4 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 27bd65913943f589b6c94d85f9d96a73de94a24c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'examples')
-rw-r--r--examples/webengine/customdialogs/doc/images/customdialogs-color1.pngbin0 -> 9729 bytes
-rw-r--r--examples/webengine/customdialogs/doc/src/customdialogs.qdoc6
2 files changed, 3 insertions, 3 deletions
diff --git a/examples/webengine/customdialogs/doc/images/customdialogs-color1.png b/examples/webengine/customdialogs/doc/images/customdialogs-color1.png
new file mode 100644
index 000000000..7f0492f87
--- /dev/null
+++ b/examples/webengine/customdialogs/doc/images/customdialogs-color1.png
Binary files differ
diff --git a/examples/webengine/customdialogs/doc/src/customdialogs.qdoc b/examples/webengine/customdialogs/doc/src/customdialogs.qdoc
index b75417456..a07c92153 100644
--- a/examples/webengine/customdialogs/doc/src/customdialogs.qdoc
+++ b/examples/webengine/customdialogs/doc/src/customdialogs.qdoc
@@ -253,7 +253,7 @@
\section2 Color Dialog Requests
- Currently, Qt WebEngine does not provide Color Dialog, a custom dialog should be implemented.
+ \image customdialogs-color1.png
\l [QML]{ColorDialogRequest} is a request object that is passed as a
parameter of the WebEngineView::colorDialogRequested signal:
@@ -273,8 +273,8 @@
\printline }
We use the \c onColorDialogRequested signal handler to check whether
- we should use the default color picker dialog (which currently is not provided).
- If not, we accept the request and switch the view to show the \c ColorPickerForm:
+ we should use the default color picker dialog. If not, we accept the request
+ and switch the view to show the \c ColorPickerForm:
\image customdialogs-color2.png