diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-24 16:14:56 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-24 16:14:56 +0100 |
| commit | ff5d39f0a8f34cdb034df703e7b2a769c945e1ed (patch) | |
| tree | 56ec1b5d03809653648e2f50d4ff88be4d7951bd /src/dialogs/qquickplatformfontdialog.cpp | |
| parent | 51156e412b2f91dbbf8c0b6055e6ab4c29370d8a (diff) | |
| parent | b69eb02366ad6d8647238f4caf8edfdcaea1b526 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
tests/auto/controls/data/tst_applicationwindow.qml
Change-Id: I2ba1f1ba9604f9417102ff076e4ab9ab4d37ab7a
Diffstat (limited to 'src/dialogs/qquickplatformfontdialog.cpp')
| -rw-r--r-- | src/dialogs/qquickplatformfontdialog.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/dialogs/qquickplatformfontdialog.cpp b/src/dialogs/qquickplatformfontdialog.cpp index 961d776d3..04650a710 100644 --- a/src/dialogs/qquickplatformfontdialog.cpp +++ b/src/dialogs/qquickplatformfontdialog.cpp @@ -114,6 +114,8 @@ QT_BEGIN_NAMESPACE onAccepted: { console.log("Selected font: " + font) } } \endqml + + The corresponding handler is \c onAccepted. */ /*! @@ -121,6 +123,8 @@ QT_BEGIN_NAMESPACE The \a rejected signal is emitted when the user has dismissed the dialog, either by closing the dialog window or by pressing the Cancel button. + + The corresponding handler is \c onRejected. */ /*! |