diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-07-01 09:59:28 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-07-01 09:59:28 +0000 |
commit | 0698f876ca02b85c1e584b72cac3444796f6a355 (patch) | |
tree | 022748fb34278fb455d8e029d912dfb0b545f443 /src/widgets/doc/src/widgets-tutorial.qdoc | |
parent | cd297f99a2ce9c53c3ac4633bdf2425af364a1bc (diff) | |
parent | 0aa2d318b1524cdab42ab9988270779ddcc1922a (diff) |
Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev
Diffstat (limited to 'src/widgets/doc/src/widgets-tutorial.qdoc')
-rw-r--r-- | src/widgets/doc/src/widgets-tutorial.qdoc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/widgets/doc/src/widgets-tutorial.qdoc b/src/widgets/doc/src/widgets-tutorial.qdoc index 31d8c612e9..a337a7a487 100644 --- a/src/widgets/doc/src/widgets-tutorial.qdoc +++ b/src/widgets/doc/src/widgets-tutorial.qdoc @@ -110,7 +110,7 @@ make sure that the executable is on your path, or enter its full location. - \li On Linux/Unix and Mac OS X, type \c make and press + \li On Linux/Unix and OS X, type \c make and press \uicontrol{Return}; on Windows with Visual Studio, type \c nmake and press \uicontrol{Return}. @@ -160,6 +160,7 @@ \table \row \li \snippet tutorials/widgets/childwidget/main.cpp main program + \row \li \inlineimage widgets-tutorial-childwidget.png \endtable \enddiv @@ -182,6 +183,7 @@ \table \row \li \snippet tutorials/widgets/windowlayout/main.cpp main program + \row \li \inlineimage widgets-tutorial-windowlayout.png \endtable \enddiv |