summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2009-10-05 12:04:39 (GMT)
committerJanne Anttila <janne.anttila@digia.com>2009-10-05 12:04:39 (GMT)
commit11e683d4a75d5071c490b8820a504de5eb47b971 (patch)
tree16e5180b3ab20a71ec9f659e962b8099b24743d8 /doc
parent369336a7946308041160f20f1399ed14c656f2a7 (diff)
parent0ae8f0b63e6705790ad0bdb0f90644b557b5ac67 (diff)
downloadQt-11e683d4a75d5071c490b8820a504de5eb47b971.zip
Qt-11e683d4a75d5071c490b8820a504de5eb47b971.tar.gz
Qt-11e683d4a75d5071c490b8820a504de5eb47b971.tar.bz2
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Diffstat (limited to 'doc')
-rw-r--r--doc/src/howtos/exceptionsafety.qdoc (renamed from doc/src/exceptionsafety.qdoc)2
-rw-r--r--doc/src/platforms/s60-introduction.qdoc (renamed from doc/src/s60-introduction.qdoc)0
-rw-r--r--doc/src/platforms/supported-platforms.qdoc2
-rw-r--r--doc/src/platforms/symbian-exceptionsafety.qdoc (renamed from doc/src/symbian-exceptionsafety.qdoc)0
4 files changed, 3 insertions, 1 deletions
diff --git a/doc/src/exceptionsafety.qdoc b/doc/src/howtos/exceptionsafety.qdoc
index b70df6b..23bedf5 100644
--- a/doc/src/exceptionsafety.qdoc
+++ b/doc/src/howtos/exceptionsafety.qdoc
@@ -42,7 +42,7 @@
/*!
\page exceptionsafety.html
\title Exception Safety
- \ingroup architecture
+ \ingroup best-practices
\brief A guide to exception safety in Qt.
\bold {Preliminary warning}: Exception safety is not feature complete!
diff --git a/doc/src/s60-introduction.qdoc b/doc/src/platforms/s60-introduction.qdoc
index d0a1976..d0a1976 100644
--- a/doc/src/s60-introduction.qdoc
+++ b/doc/src/platforms/s60-introduction.qdoc
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc
index 65d335b..4c3929a 100644
--- a/doc/src/platforms/supported-platforms.qdoc
+++ b/doc/src/platforms/supported-platforms.qdoc
@@ -128,6 +128,8 @@
\o Intel Compiler
\row \o Embedded Linux QWS (Mips, PowerPC)
\o gcc (\l{http:\\www.codesourcery.com}{Codesourcery version)}
+ \row \o Embedded Linux X11 (ARM)
+ \o gcc (\l{http://www.scratchbox.org/}{Scratchbox)}
\row \o Windows CE 6.0 (ARMv4i, x86, MIPS)
\o MSVC 2008 WinCE 6.0 Professional
\endtable
diff --git a/doc/src/symbian-exceptionsafety.qdoc b/doc/src/platforms/symbian-exceptionsafety.qdoc
index 88f4d03..88f4d03 100644
--- a/doc/src/symbian-exceptionsafety.qdoc
+++ b/doc/src/platforms/symbian-exceptionsafety.qdoc