summaryrefslogtreecommitdiffstats
path: root/doc/src/tutorials/widgets-tutorial.qdoc
diff options
context:
space:
mode:
authorJanne Koskinen <janne.p.koskinen@digia.com>2009-05-11 12:16:25 (GMT)
committerJanne Koskinen <janne.p.koskinen@digia.com>2009-05-11 12:16:25 (GMT)
commitf005af3b8c8405219b39bacd348d3861f1243aa8 (patch)
treea2d1f332de493d3d2cf0e0d1b3ad7c062176fe39 /doc/src/tutorials/widgets-tutorial.qdoc
parent8aaa0cbf3451dee7bc8e8276faad3b2f2954dc1c (diff)
parent565f2957fb049f2df0330fac72ec5335860b9c7f (diff)
downloadQt-f005af3b8c8405219b39bacd348d3861f1243aa8.zip
Qt-f005af3b8c8405219b39bacd348d3861f1243aa8.tar.gz
Qt-f005af3b8c8405219b39bacd348d3861f1243aa8.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Conflicts: src/gui/widgets/qmenu_symbian.cpp
Diffstat (limited to 'doc/src/tutorials/widgets-tutorial.qdoc')
-rw-r--r--doc/src/tutorials/widgets-tutorial.qdoc27
1 files changed, 4 insertions, 23 deletions
diff --git a/doc/src/tutorials/widgets-tutorial.qdoc b/doc/src/tutorials/widgets-tutorial.qdoc
index ce977f3..ead44af 100644
--- a/doc/src/tutorials/widgets-tutorial.qdoc
+++ b/doc/src/tutorials/widgets-tutorial.qdoc
@@ -80,7 +80,7 @@
\raw HTML
<table align="left" width="100%">
- <tr><td>
+ <tr class="qt-code"><td>
\endraw
\snippet snippets/widgets-tutorial/toplevel/main.cpp create, resize and show
\raw HTML
@@ -98,7 +98,7 @@
\raw HTML
<table align="left" width="100%">
- <tr><td>
+ <tr class="qt-code"><td>
\endraw
\snippet snippets/widgets-tutorial/childwidget/main.cpp create, position and show
\raw HTML
@@ -123,7 +123,7 @@
\raw HTML
<table align="left" width="100%">
- <tr><td>
+ <tr class="qt-code"><td>
\endraw
\snippet snippets/widgets-tutorial/windowlayout/main.cpp create, lay out widgets and show
\raw HTML
@@ -157,7 +157,7 @@
\raw HTML
<table align="left" width="100%">
- <tr><td>
+ <tr class="qt-code"><td>
\endraw
\snippet snippets/widgets-tutorial/nestedlayouts/main.cpp create, lay out widgets and show
\raw HTML
@@ -171,23 +171,4 @@
As well as QHBoxLayout and QVBoxLayout, Qt also provides QGridLayout
and QFormLayout classes to help with more complex user interfaces.
-
-
-
- \omit
- In the simple example below, the widget is created on the stack and will
- automatically be deleted when the \c{main()} function exits.
-
- {{{#include <QtGui>
-
- int main(int argc, char *argv[])
- {
- QApplication app(argc, argv);
- QWidget window;
- window.resize(480, 360);
- window.show();
- return app.exec();
- }
- }}}
- \endomit
*/