summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2009-11-11 08:56:29 (GMT)
committeraxis <qt-info@nokia.com>2009-11-11 08:56:29 (GMT)
commitea89740eb847e7e9499f2f249d2aec0969e6a919 (patch)
tree7ee6e052b6de249a7aa32365b457588cc0610ca9 /doc/src
parentfe23fd01b4fc61b109bc81bcbac2f832929fb482 (diff)
parent62487172ed3822d863553a7b7b50bcdbf05923a6 (diff)
downloadQt-ea89740eb847e7e9499f2f249d2aec0969e6a919.zip
Qt-ea89740eb847e7e9499f2f249d2aec0969e6a919.tar.gz
Qt-ea89740eb847e7e9499f2f249d2aec0969e6a919.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/images/hoverevents.pngbin0 -> 3210 bytes
-rw-r--r--doc/src/platforms/supported-platforms.qdoc4
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/images/hoverevents.png b/doc/src/images/hoverevents.png
new file mode 100644
index 0000000..ccc079b
--- /dev/null
+++ b/doc/src/images/hoverevents.png
Binary files differ
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc
index 232eca6..560ddfe 100644
--- a/doc/src/platforms/supported-platforms.qdoc
+++ b/doc/src/platforms/supported-platforms.qdoc
@@ -86,7 +86,7 @@
\row \o Apple Mac OS X 10.5 "Leopard" x86_64 (Carbon, Cocoa 32 and 64bit)
\o As provided by Apple
\row \o Embedded Linux QWS (ARM)
- \o gcc (\l{http://www.codesourcery.com}{Codesourcery version)}
+ \o gcc (\l{http://www.codesourcery.com/}{Codesourcery version)}
\row \o Windows CE 5.0 (ARMv4i, x86, MIPS)
\o MSVC 2005 WinCE 5.0 Standard (x86, pocket, smart, mipsii)
\row \o Symbian (S60 3.1, 3.2 and 5.0)
@@ -125,7 +125,7 @@
\row \o Linux
\o Intel Compiler
\row \o Embedded Linux QWS (Mips, PowerPC)
- \o gcc (\l{http:\\www.codesourcery.com}{Codesourcery version)}
+ \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)