diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2009-10-28 08:26:20 (GMT) |
---|---|---|
committer | Alan Alpert <alan.alpert@nokia.com> | 2009-10-28 08:26:20 (GMT) |
commit | 07e1b6615e868af6434bb8e42dc2d44a51075204 (patch) | |
tree | 5bc94729576e561eae6bb9470dda0ab61b439f18 /doc/src/declarative/qtprogrammers.qdoc | |
parent | 1d14bbef27945d7823e9c32745e51d187093f1b7 (diff) | |
parent | 30d8810bfab9c8157f80e5e38beda1ad8c0acfb0 (diff) | |
download | Qt-07e1b6615e868af6434bb8e42dc2d44a51075204.zip Qt-07e1b6615e868af6434bb8e42dc2d44a51075204.tar.gz Qt-07e1b6615e868af6434bb8e42dc2d44a51075204.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
doc/src/declarative/globalobject.qdoc
Diffstat (limited to 'doc/src/declarative/qtprogrammers.qdoc')
-rw-r--r-- | doc/src/declarative/qtprogrammers.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/declarative/qtprogrammers.qdoc b/doc/src/declarative/qtprogrammers.qdoc index ea27d7e..4c28255 100644 --- a/doc/src/declarative/qtprogrammers.qdoc +++ b/doc/src/declarative/qtprogrammers.qdoc @@ -109,7 +109,7 @@ just as QTextEdit, QWebView, and QListView are built upon those same UI-agnostic components. The encapsulation of the look and feel that QWidgets gives is important, and for this -the QML concept of \l components serves the same purpose. If you are building a complete +the QML concept of \l {qmldocuments.html}{components} serves the same purpose. If you are building a complete suite of applications which should have a consistent look and feel, you should build a set of reusable components with the look and feel you desire. |