summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2009-11-05 16:37:15 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2009-11-05 16:37:15 (GMT)
commitf1f3450e59d8d070e01c9bd852855daaeacd1390 (patch)
tree20547c94b74843d7b6e24b6fe6028b4d48cfe66b /doc
parent4cd683231190443e5243f66098c7322e3808a131 (diff)
parent16350cb5204255aacc4026bb5e797d3058ccb9ca (diff)
downloadQt-f1f3450e59d8d070e01c9bd852855daaeacd1390.zip
Qt-f1f3450e59d8d070e01c9bd852855daaeacd1390.tar.gz
Qt-f1f3450e59d8d070e01c9bd852855daaeacd1390.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6
Diffstat (limited to 'doc')
-rw-r--r--doc/src/howtos/guibooks.qdoc6
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/src/howtos/guibooks.qdoc b/doc/src/howtos/guibooks.qdoc
index c41d8fa..6e64c09 100644
--- a/doc/src/howtos/guibooks.qdoc
+++ b/doc/src/howtos/guibooks.qdoc
@@ -52,8 +52,10 @@
GUI Programming with Qt 4, Second Edition}}
by Jasmin Blanchette and Mark
Summerfield, ISBN 0-13-235416-0. This is the official Qt book written
- by two veteran Trolls. The first edition, which is based on Qt 4.1, is available
- \l{http://www.qtrac.eu/C++-GUI-Programming-with-Qt-4-1st-ed.zip}{online}.
+ by two veteran Trolls. The first edition, which is based on Qt 4.1, is
+ \l{http://www.qtrac.eu/C++-GUI-Programming-with-Qt-4-1st-ed.zip}{available online}.
+ The second edition, based on Qt 4.3, is
+ \l{http://www.informit.com/store/product.aspx?isbn=0132354160}{also available online}.
\bold{\l{http://www.amazon.com/exec/obidos/ASIN/0385267746/trolltech/t}{The Design of Everyday Things}}
by Donald Norman, ISBN 0-38526774-6, is one of the classics of human