summaryrefslogtreecommitdiffstats
path: root/doc/src/deployment/deployment.qdoc
diff options
context:
space:
mode:
authorninerider <qt-info@nokia.com>2009-11-23 12:28:19 (GMT)
committerninerider <qt-info@nokia.com>2009-11-23 12:28:19 (GMT)
commit4cfc3a884835667fe8c3a6aa745dc4ace34794e4 (patch)
tree553a33b8112750d1d2dd7dc503c9c70391538b07 /doc/src/deployment/deployment.qdoc
parentcda63c368dbb5acd040e2190db8f25de69462d8e (diff)
parent4112771f56e827d1d8fbde0995ebf5b0242c01a8 (diff)
downloadQt-4cfc3a884835667fe8c3a6aa745dc4ace34794e4.zip
Qt-4cfc3a884835667fe8c3a6aa745dc4ace34794e4.tar.gz
Qt-4cfc3a884835667fe8c3a6aa745dc4ace34794e4.tar.bz2
Merge remote branch 'origin/4.6' into 4.6-ce
Diffstat (limited to 'doc/src/deployment/deployment.qdoc')
-rw-r--r--doc/src/deployment/deployment.qdoc8
1 files changed, 7 insertions, 1 deletions
diff --git a/doc/src/deployment/deployment.qdoc b/doc/src/deployment/deployment.qdoc
index ea841f9..6a1760e 100644
--- a/doc/src/deployment/deployment.qdoc
+++ b/doc/src/deployment/deployment.qdoc
@@ -1491,7 +1491,13 @@
\o Accessibility for Qt3Support is deployed if the application uses the Qt3Support module.
\endlist
- macdeployqt supports the following options:
+ \note If you want a 3rd party library to be included in your
+ application bundle, then you must add an excplicit lib entry for
+ that library to your application's .pro file. Otherwise, the
+ \c macdeployqt tool will not copy the 3rd party .dylib into the
+ bundle.
+
+ \c macdeployqt supports the following options:
\list
\o -no-plugins: Skip plugin deployment
\o -dmg : Create a .dmg disk image