summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2018-02-16 11:27:01 +0100
committerJohan Helsing <johan.helsing@qt.io>2018-02-19 08:56:24 +0000
commitfeba2a68b18d4d47c0c3e2644ab996e76c97da56 (patch)
treef9f041a9dab528cd68377ff7140191b9947116a5 /src/gui
parent8a66924ca000fe4e05b680ca82c6587da8d28e0b (diff)
Fix incorrect documentation for -platform, QT_QPA_PLATFORM and friends
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>
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/kernel/qguiapplication.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index f7da94d111..b4bc4b85d0 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -525,21 +525,21 @@ static QWindowGeometrySpecification windowGeometrySpecification = Q_WINDOW_GEOME
\li \c{-platform} \e {platformName[:options]}, specifies the
\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
plugins.
- Overridden by the \c QT_QPA_PLATFORM_PLUGIN_PATH environment
- variable.
+ Overrides the \c QT_QPA_PLATFORM_PLUGIN_PATH environment variable.
\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
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.
The value must be of format \c{port:1234}\e{[,block]}, where