diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-22 11:30:00 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-22 11:30:01 +0200 |
| commit | d314819fc02139e05e16c56657898c704f7fb48f (patch) | |
| tree | a61ba968233634948401c8339f9613844de1c2b5 /examples/widgets/doc/src/classwizard.qdoc | |
| parent | 9f888d2fde9c5413e5519e0914e9b13638760985 (diff) | |
| parent | e0e9e196a72ffe5457034894eaaadc90ed0d34ef (diff) | |
| download | qtbase-d314819fc02139e05e16c56657898c704f7fb48f.tar.gz | |
Merge dev into 5.8
Change-Id: I41ee7b50534b01cf042bed8bb8824ba2e5026a29
Diffstat (limited to 'examples/widgets/doc/src/classwizard.qdoc')
| -rw-r--r-- | examples/widgets/doc/src/classwizard.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/widgets/doc/src/classwizard.qdoc b/examples/widgets/doc/src/classwizard.qdoc index 9391e0e133..6977cf5efa 100644 --- a/examples/widgets/doc/src/classwizard.qdoc +++ b/examples/widgets/doc/src/classwizard.qdoc @@ -76,7 +76,7 @@ \endlist Although the program is just an example, if you press \uicontrol Finish - (\uicontrol Done on OS X), actual C++ source files will actually be + (\uicontrol Done on \macos), actual C++ source files will actually be generated. \section1 The ClassWizard Class @@ -158,7 +158,7 @@ layouts. The \c className field is created with an asterisk (\c *) next to its name. This makes it a \l{mandatory fields}{mandatory field}, that is, a field that must be filled before the user can press the - \uicontrol Next button (\uicontrol Continue on OS X). The fields' values + \uicontrol Next button (\uicontrol Continue on \macos). The fields' values can be accessed from any other page using QWizardPage::field(), or from the wizard code using QWizard::field(). |