diff options
| author | Casper van Donderen <casper.vandonderen@nokia.com> | 2012-05-07 18:49:48 +0200 |
|---|---|---|
| committer | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2012-05-09 08:36:46 +0200 |
| commit | 97b5b8009254004608feefb903cbf44abaa099f6 (patch) | |
| tree | cf3a79caa34085de1308eb86cac6ea0d9663aa9c /src/widgets/dialogs/qcolordialog.cpp | |
| parent | cfdc5628b1fc2cbafa2aebca38995e5718fcb0de (diff) | |
Doc: Modularize QtWidgets documentation.
This change moves the snippets and images to the modularized
directories.
Change-Id: Idec1afb9db7ea6add1ca4cf25ec4019d8bce0c4d
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Diffstat (limited to 'src/widgets/dialogs/qcolordialog.cpp')
| -rw-r--r-- | src/widgets/dialogs/qcolordialog.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/widgets/dialogs/qcolordialog.cpp b/src/widgets/dialogs/qcolordialog.cpp index d7a8f5dc21..f034590ccb 100644 --- a/src/widgets/dialogs/qcolordialog.cpp +++ b/src/widgets/dialogs/qcolordialog.cpp @@ -1717,7 +1717,7 @@ QColor QColorDialog::currentColor() const } /*! - Returns the color that the user selected by clicking the \gui{OK} + Returns the color that the user selected by clicking the \uicontrol{OK} or equivalent button. \note This color is not always the same as the color held by the @@ -1795,7 +1795,7 @@ QColorDialog::ColorDialogOptions QColorDialog::options() const of a color dialog. \value ShowAlphaChannel Allow the user to select the alpha component of a color. - \value NoButtons Don't display \gui{OK} and \gui{Cancel} buttons. (Useful for "live dialogs".) + \value NoButtons Don't display \uicontrol{OK} and \uicontrol{Cancel} buttons. (Useful for "live dialogs".) \value DontUseNativeDialog Use Qt's standard color dialog on the Mac instead of Apple's native color panel. @@ -1819,7 +1819,7 @@ bool QColorDialogPrivate::sharedColorPanelAvailable = true; /*! \fn void QColorDialog::colorSelected(const QColor &color); - This signal is emitted just after the user has clicked \gui{OK} to + This signal is emitted just after the user has clicked \uicontrol{OK} to select a color to use. The chosen color is specified by \a color. \sa color, currentColorChanged() @@ -1933,7 +1933,7 @@ QColor QColorDialog::getColor(const QColor &initial, QWidget *parent, const QStr initially set to \a initial. The dialog is a child of \a parent. If \a ok is non-null, \e *\a ok is set to true if the user clicked - \gui{OK}, and to false if the user clicked Cancel. + \uicontrol{OK}, and to false if the user clicked Cancel. If the user clicks Cancel, the \a initial value is returned. |