summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDebao Zhang <hello@debao.me>2012-12-21 15:42:48 +0800
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-01-24 15:35:19 +0100
commit97c613fbbba184fedd984d846b4d41c6b2a2b0e5 (patch)
tree060729b4cab5a9fb5e91001830582d618a852e57
parente7435af29366e979411130a1aa38179eda5269bc (diff)
downloadqtdoc-97c613fbbba184fedd984d846b4d41c6b2a2b0e5.tar.gz
Fix deploying documentation on Windows and *nix.
Library names have been changed to {lib}Qt5Xxxx.{dll,lib,a,so.5}. Task-number: QTBUG-28925 Change-Id: Icdbce0a747f71118a14582242b803b2bd916155f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Thiago Augusto Correa <thiago.correa@gmail.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
-rw-r--r--doc/src/deployment/deployment.qdoc31
1 files changed, 17 insertions, 14 deletions
diff --git a/doc/src/deployment/deployment.qdoc b/doc/src/deployment/deployment.qdoc
index c105cba1..64192111 100644
--- a/doc/src/deployment/deployment.qdoc
+++ b/doc/src/deployment/deployment.qdoc
@@ -393,11 +393,17 @@
\li The ExtraFilters plugin
\li {2, 1} \c plugins\libpnp_extrafilters.so
\row
+ \li The Qt xcb platform plugin
+ \li {2, 1} \c platforms\libqxcb.so
+ \row
\li The Qt Core module
- \li {2, 1} \c libQtCore.so.4
+ \li {2, 1} \c libQt5Core.so.5
\row
\li The Qt GUI module
- \li {2, 1} \c libQtGui.so.4
+ \li {2, 1} \c libQt5Gui.so.5
+ \row
+ \li The Qt Widgets module
+ \li {2, 1} \c libQt5Widgets.so.5
\endtable
On most systems, the extension for shared libraries is \c .so. A
@@ -536,11 +542,8 @@
\snippet doc/src/snippets/code/doc_src_deployment.qdoc 12
- This will build Qt statically. Note that unlike with a dynamic build,
- building Qt statically will result in libraries without version numbers;
- e.g. \c QtCore5.lib will be \c QtCore.lib. Also, we have used \c nmake
- in all the examples, but if you use MinGW you must use
- \c mingw32-make instead.
+ This will build Qt statically. Note that we have used \c nmake
+ in all the examples, but \c mingw32-make should be used for MinGW.
\note If you later need to reconfigure and rebuild Qt from the
same location, ensure that all traces of the previous configuration are
@@ -697,16 +700,16 @@
\li {2, 1} \c plugins\pnp_extrafilters.dll
\row
\li The Qt Windows platform plugin
- \li {2, 1} \c platforms\windows.dll
+ \li {2, 1} \c platforms\qwindows.dll
\row
\li The Qt Core module
- \li {2, 1} \c qtcore5.dll
+ \li {2, 1} \c Qt5Core.dll
\row
\li The Qt GUI module
- \li {2, 1} \c qtgui5.dll
+ \li {2, 1} \c Qt5Gui.dll
\row
\li The Qt Widgets module
- \li {2, 1} \c qtwidgets5.dll
+ \li {2, 1} \c Qt5Widgets.dll
\endtable
In addition, the archive must contain the following compiler
@@ -883,9 +886,9 @@
\li MinGW
\row
\li \list
- \li QTCORE5.DLL - The QtCore runtime
- \li QTGUI5.DLL - The QtGui runtime
- \li QTWIDGETS5.DLL - The QtWidgets runtime
+ \li QT5CORE.DLL - The QtCore runtime
+ \li QT5GUI.DLL - The QtGui runtime
+ \li QT5WIDGETS.DLL - The QtWidgets runtime
\endlist
\li \list
\li MSVCR80.DLL - The C runtime