summaryrefslogtreecommitdiffstats
path: root/doc/src/mac-differences.qdoc
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2009-05-24 23:58:54 (GMT)
committerMartin Jones <martin.jones@nokia.com>2009-05-24 23:58:54 (GMT)
commit19038ba0847d3b8ed476d8c3c1d29332d4f80677 (patch)
tree0374a25291e47d576dc9c45ef43acd7d830195cc /doc/src/mac-differences.qdoc
parent641c7cbdc52f84c07cf5bb628840bd6072e64764 (diff)
parentbfff04ba4fab92e1cfa57954c9df2d3b5ed807ef (diff)
downloadQt-19038ba0847d3b8ed476d8c3c1d29332d4f80677.zip
Qt-19038ba0847d3b8ed476d8c3c1d29332d4f80677.tar.gz
Qt-19038ba0847d3b8ed476d8c3c1d29332d4f80677.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'doc/src/mac-differences.qdoc')
-rw-r--r--doc/src/mac-differences.qdoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/mac-differences.qdoc b/doc/src/mac-differences.qdoc
index 573e62d..5849850 100644
--- a/doc/src/mac-differences.qdoc
+++ b/doc/src/mac-differences.qdoc
@@ -128,7 +128,7 @@
If you want to build a new dynamic library combining the Qt 4
dynamic libraries, you need to introduce the \c{ld -r} flag. Then
- relocation information is stored in the the output file, so that
+ relocation information is stored in the output file, so that
this file could be the subject of another \c ld run. This is done
by setting the \c -r flag in the \c .pro file, and the \c LFLAGS
settings.