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

Fix incorrect documentation for -platform, QT_QPA_PLATFORM and friends

Browse Source 
This makes the documentation match the implementation.

-platform overrides QT_QPA_PLATFORM, not the other way around. Similarly
for the other arguments.

Change-Id: Iffaf8bb1134bc57e5b682f37b9cc1a713872ede1
Reviewed-by: Martin Smith <martin.smith@qt.io>
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
Johan Klokkhammer Helsing 2018-02-16 11:27:01 +01:00 committed by Johan Helsing
parent 8a66924ca0
commit feba2a68b1
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/kernel/qguiapplication.cpp
View File

@ -525,21 +525,21 @@ static QWindowGeometrySpecification windowGeometrySpecification = Q_WINDOW_GEOME
\li \c{-platform} \e {platformName[:options]}, specifies the \li \c{-platform} \e {platformName[:options]}, specifies the
\l{Qt Platform Abstraction} (QPA) plugin. \l{Qt Platform Abstraction} (QPA) plugin.
Overridden by the \c QT_QPA_PLATFORM environment variable. Overrides the \c QT_QPA_PLATFORM environment variable.
\li \c{-platformpluginpath} \e path, specifies the path to platform \li \c{-platformpluginpath} \e path, specifies the path to platform
plugins. plugins.
Overridden by the \c QT_QPA_PLATFORM_PLUGIN_PATH environment Overrides the \c QT_QPA_PLATFORM_PLUGIN_PATH environment variable.
variable.
\li \c{-platformtheme} \e platformTheme, specifies the platform theme. \li \c{-platformtheme} \e platformTheme, specifies the platform theme.
Overridden by the \c QT_QPA_PLATFORMTHEME environment variable. Overrides the \c QT_QPA_PLATFORMTHEME environment variable.
\li \c{-plugin} \e plugin, specifies additional plugins to load. The argument \li \c{-plugin} \e plugin, specifies additional plugins to load. The argument
may appear multiple times. may appear multiple times.
Overridden by the \c QT_QPA_GENERIC_PLUGINS environment variable. Concatenated with the plugins in the \c QT_QPA_GENERIC_PLUGINS environment
variable.
\li \c{-qmljsdebugger=}, activates the QML/JS debugger with a specified port. \li \c{-qmljsdebugger=}, activates the QML/JS debugger with a specified port.
The value must be of format \c{port:1234}\e{[,block]}, where The value must be of format \c{port:1234}\e{[,block]}, where