From e952f233e6ac9212a9c9d857ce897f5a9676812c Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Mon, 9 Sep 2013 16:24:48 +0200 Subject: Fix echoplugin docs: Q_INTERFACES expects a space-separated list. Task-number: QTBUG-25580 Change-Id: I736d5743b7901bf207c31795c96acc02fd149277 Reviewed-by: Jerome Pasion --- examples/widgets/doc/src/echoplugin.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples') diff --git a/examples/widgets/doc/src/echoplugin.qdoc b/examples/widgets/doc/src/echoplugin.qdoc index 2c56a2f53b..9e2b0c35de 100644 --- a/examples/widgets/doc/src/echoplugin.qdoc +++ b/examples/widgets/doc/src/echoplugin.qdoc @@ -145,7 +145,7 @@ plugin. The Q_INTERFACES macro tells Qt which interfaces the class implements. In our case we only implement the \c EchoInterface. If a class implements more than one interface, they are given as - a comma separated list. The Q_PLUGIN_METADATA macro is included next + a space separated list. The Q_PLUGIN_METADATA macro is included next to the Q_OBJECT macro. It contains the plugins IID and a filename pointing to a json file containing the metadata for the plugin. The json file is compiled into the plugin and does not need to be installed. -- cgit v1.2.3 From 472f3c17e302d0eb7376f3f8e2716a51e1d0f5cf Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Tue, 10 Sep 2013 15:21:59 +0200 Subject: standarddialogs example: add detailed text Demonstrates that you can have mnemonic buttons which don't conflict with the Ctrl-A and Ctrl-C shortcuts. Task-number: QTBUG-6731 Change-Id: I41ce64e6f3bd0cf387af13c5c37894b721b5a3bb Reviewed-by: Marc Mutz --- examples/widgets/dialogs/standarddialogs/dialog.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'examples') diff --git a/examples/widgets/dialogs/standarddialogs/dialog.cpp b/examples/widgets/dialogs/standarddialogs/dialog.cpp index c626b63b7d..15b1550fac 100644 --- a/examples/widgets/dialogs/standarddialogs/dialog.cpp +++ b/examples/widgets/dialogs/standarddialogs/dialog.cpp @@ -47,6 +47,9 @@ "and any number of buttons, each with standard or custom texts." \ "

Click a button to close the message box. Pressing the Esc button " \ "will activate the detected escape button (if any).") +#define MESSAGE_DETAILS \ + Dialog::tr("If a message box has detailed text, the user can reveal it " \ + "by pressing the Show Details... button.") class DialogOptionsWidget : public QGroupBox @@ -448,6 +451,7 @@ void Dialog::warningMessage() { QMessageBox msgBox(QMessageBox::Warning, tr("QMessageBox::warning()"), MESSAGE, 0, this); + msgBox.setDetailedText(MESSAGE_DETAILS); msgBox.addButton(tr("Save &Again"), QMessageBox::AcceptRole); msgBox.addButton(tr("&Continue"), QMessageBox::RejectRole); if (msgBox.exec() == QMessageBox::AcceptRole) -- cgit v1.2.3