diff options
| author | Geir Vattekar <geir.vattekar@nokia.com> | 2011-02-17 12:14:01 (GMT) |
|---|---|---|
| committer | Geir Vattekar <geir.vattekar@nokia.com> | 2011-02-17 12:14:01 (GMT) |
| commit | f5f2eb86b5a9fb4bcc479a4fdba4024e5544ba24 (patch) | |
| tree | f0a0cc24f418c40cc03a61e493e7412c5d9a88f9 /doc/src/snippets/code/doc_src_deployment.qdoc | |
| parent | 45153a37e4d9e39e8c326a0f33ea17be49bb29e2 (diff) | |
| parent | ebd3c48478539c7b2ec76af5c385b690460c3e15 (diff) | |
| download | Qt-f5f2eb86b5a9fb4bcc479a4fdba4024e5544ba24.zip Qt-f5f2eb86b5a9fb4bcc479a4fdba4024e5544ba24.tar.gz Qt-f5f2eb86b5a9fb4bcc479a4fdba4024e5544ba24.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'doc/src/snippets/code/doc_src_deployment.qdoc')
| -rw-r--r-- | doc/src/snippets/code/doc_src_deployment.qdoc | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/doc/src/snippets/code/doc_src_deployment.qdoc b/doc/src/snippets/code/doc_src_deployment.qdoc index c5f4644..760bd8f 100644 --- a/doc/src/snippets/code/doc_src_deployment.qdoc +++ b/doc/src/snippets/code/doc_src_deployment.qdoc @@ -96,20 +96,10 @@ dirname=$PWD/$dirname fi LD_LIBRARY_PATH=$dirname export LD_LIBRARY_PATH -$dirname/$appname $* +$dirname/$appname "$@" //! [7] -//! [8] -DESTDIR = /path/to/Qt/plugandpaint/plugins -//! [8] - - -//! [9] -qApp->addLibraryPath("/some/other/path"); -//! [9] - - //! [10] ldd ./application //! [10] @@ -164,11 +154,6 @@ plugins\pnp_extrafilters.dll //! [18] -//! [19] -qApp->addLibraryPath("C:\some\other\path"); -//! [19] - - //! [20] embed_manifest_dll embed_manifest_exe @@ -411,14 +396,6 @@ install_name_tool -change /path/to/Qt/lib/QtCore.framework/Versions/4.0/QtCore //! [48] -//! [49] -QDir dir(QApplication::applicationDirPath()); -dir.cdUp(); -dir.cd("plugins"); -QApplication::setLibraryPaths(QStringList(dir.absolutePath())); -//! [49] - - //! [50] otool -L MyApp.app/Contents/MacOS/MyApp //! [50] @@ -483,4 +460,4 @@ make release-gcce //! [59] make installer_sis -//! [59]
\ No newline at end of file +//! [59] |