diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2011-02-16 11:54:13 (GMT) |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2011-02-16 11:54:13 (GMT) |
| commit | 0df215e5afc780c1fddd9e410f7ef0814ac1307c (patch) | |
| tree | 6ac4abf3fcc9c41093b760f4f113221811e2e2ad /doc/src/examples/concentriccircles.qdoc | |
| parent | 3f3a0f31b74774051021d969e008d7bd1536b010 (diff) | |
| parent | 0a24d2d6269d509e775f7da91c8002eddc2dcbd7 (diff) | |
| download | Qt-0df215e5afc780c1fddd9e410f7ef0814ac1307c.zip Qt-0df215e5afc780c1fddd9e410f7ef0814ac1307c.tar.gz Qt-0df215e5afc780c1fddd9e410f7ef0814ac1307c.tar.bz2 | |
Merge remote branch 'qt/master' into earth-team-staging
Conflicts:
src/s60installs/bwins/QtGuiu.def
Diffstat (limited to 'doc/src/examples/concentriccircles.qdoc')
| -rw-r--r-- | doc/src/examples/concentriccircles.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/examples/concentriccircles.qdoc b/doc/src/examples/concentriccircles.qdoc index dc17871..315469b 100644 --- a/doc/src/examples/concentriccircles.qdoc +++ b/doc/src/examples/concentriccircles.qdoc @@ -192,7 +192,7 @@ \snippet examples/painting/concentriccircles/window.h 0 - We declare the various components of the main window, i.e the text + We declare the various components of the main window, i.e., the text labels and a double array that will hold reference to the four \c {CircleWidget}s. In addition we declare the private \c createLabel() function to simplify the constructor. |