diff options
author | Sami Merila <sami.merila@nokia.com> | 2011-03-29 09:26:18 (GMT) |
---|---|---|
committer | Sami Merila <sami.merila@nokia.com> | 2011-03-29 09:26:18 (GMT) |
commit | 32dcbc38ef2332bd93d66782eae2de5020e998b4 (patch) | |
tree | d367ea12c5cbf2f3b55420e2419e04b4cba1d90b /doc/src/snippets/code/doc_src_deployment.qdoc | |
parent | 4f8d4492b8cafcdef71b5b40482c1eddb23062ab (diff) | |
parent | 85360044130a13f7041e5291334423ad0b180cb3 (diff) | |
download | Qt-32dcbc38ef2332bd93d66782eae2de5020e998b4.zip Qt-32dcbc38ef2332bd93d66782eae2de5020e998b4.tar.gz Qt-32dcbc38ef2332bd93d66782eae2de5020e998b4.tar.bz2 |
Merge commit 'refs/merge-requests/2584' of gitorious.org:qt/qt into merge-requests/2584
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] |