1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

doc fixes

Browse Source 
Change-Id: I77da456b89accd7fc363471fe8e370da17e2fdcc
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Oswald Buddenhagen 2014-04-16 21:19:07 +02:00 committed by The Qt Project
parent bbcdccd676
commit cae970c686
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/corelib/doc/src/plugins-howto.qdoc
View File

@ -234,7 +234,7 @@
application is to compile it into a dynamic library that is shipped application is to compile it into a dynamic library that is shipped
separately, and detected and loaded at runtime. separately, and detected and loaded at runtime.
Plugins can be linked statically against your application. If you Plugins can be linked statically into your application. If you
build the static version of Qt, this is the only option for build the static version of Qt, this is the only option for
including Qt's predefined plugins. Using static plugins makes the including Qt's predefined plugins. Using static plugins makes the
deployment less error-prone, but has the disadvantage that no deployment less error-prone, but has the disadvantage that no
@ -253,7 +253,8 @@
\row \li \c qico \li Image formats \li ICO \row \li \c qico \li Image formats \li ICO
\row \li \c qsvg \li Image formats \li SVG \row \li \c qsvg \li Image formats \li SVG
\row \li \c qtiff \li Image formats \li TIFF \row \li \c qtiff \li Image formats \li TIFF
\row \li \c qsqldb2 \li SQL driver \li IBM DB2 \row \li \c qsqlibase \li SQL driver \li Borland InterBase \row \li \c qsqldb2 \li SQL driver \li IBM DB2
\row \li \c qsqlibase \li SQL driver \li Borland InterBase
\row \li \c qsqlite \li SQL driver \li SQLite version 3 \row \li \c qsqlite \li SQL driver \li SQLite version 3
\row \li \c qsqlite2 \li SQL driver \li SQLite version 2 \row \li \c qsqlite2 \li SQL driver \li SQLite version 2
\row \li \c qsqlmysql \li SQL driver \li MySQL \row \li \c qsqlmysql \li SQL driver \li MySQL
@ -263,7 +264,7 @@
\row \li \c qsqltds \li SQL driver \li Sybase Adaptive Server (TDS) \row \li \c qsqltds \li SQL driver \li Sybase Adaptive Server (TDS)
\endtable \endtable
To link statically against those plugins, you need to add To link those plugins statically, you need to add
the required plugins to your build using \c QTPLUGIN. the required plugins to your build using \c QTPLUGIN.
Q_IMPORT_PLUGIN() macros are also needed in application code, Q_IMPORT_PLUGIN() macros are also needed in application code,
but those are automatically generated by qmake and added to but those are automatically generated by qmake and added to