From 5e207d3aec8d049e9bbb8cb6b337f1c405edb31d Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Wed, 22 Apr 2020 07:49:08 +0200
Subject: [PATCH] Update uic, rcc command line help to reflect Python usage

Change-Id: If1e15d55a4b73f790e7c5cd06300752b82863199
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: hjk <hjk@qt.io>
(cherry picked from commit 86c7c40f8d19c82ab837931bab83586b1b01a62e)
---
 doc/src/development/rcc.qdoc | 15 ++++++++++++---
 doc/src/development/uic.qdoc | 23 +++++++++++++----------
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/doc/src/development/rcc.qdoc b/doc/src/development/rcc.qdoc
index 7400d3e38..054df4b4d 100644
--- a/doc/src/development/rcc.qdoc
+++ b/doc/src/development/rcc.qdoc
@@ -45,6 +45,8 @@
 
     \row \li \c{-o} \li \c{file} \li Write output to \c{file} rather than to stdout.
 
+    \row \li \c{-g, --generator} \li \c {<cpp|python|python2>} \li Select generator.
+
     \row \li \c{-name} \li \c{name} \li Create an external initialization
                                      function with \c{name}.
 
@@ -79,6 +81,8 @@
 
     \row \li \c{-no-compress} \li \li Disable compression.
 
+    \row \li \c{--pass} \li \c{<number>} \li Pass number for big resources
+
     \row \li \c{-binary} \li \li Output a binary file for use as a dynamic resource.
 
     \row \li \c{-version} \li \li Display version information.
@@ -93,12 +97,17 @@
 
     \row \li \c{--list} \li \li Only list .qrc file entries, do not generate code.
 
+    \row \li \c{--list-mapping} \li \li Only output a mapping of resource paths
+                                        to file system paths defined in the .qrc
+                                        file, do not generate code.
+
+    \row \li \c{-d, --depfile} \li \c{<file>} \li Write a depfile with the .qrc
+                                                  dependencies to <file>.
+
     \row \li \c{-project} \li \li Output a resource file containing all files from the
                                   current directory.
 
-
-
-
+    \row \li \c{--format-version \li \c{<number>} \li The RCC format version to write.
 
     \endtable
 
diff --git a/doc/src/development/uic.qdoc b/doc/src/development/uic.qdoc
index ed39a71a0..71a9a2881 100644
--- a/doc/src/development/uic.qdoc
+++ b/doc/src/development/uic.qdoc
@@ -48,16 +48,19 @@
 
     \table
     \header \li Option \li Description
-    \row \li \c{-o <file>} \li Write output to \c <file> instead of to standard output.
-    \row \li \c{-tr <func>} \li Use \c <func> for translating strings instead of \c tr().
-    \row \li \c{-p} \li Don't generate guards against multiple inclusion (\c #ifndef FOO_H ...).
-    \row \li \c{-h} \li Display the usage and the list of options.
-    \row \li \c{-v} \li Display \c{uic}'s version number.
-    \row \li \c{-d} \li Display the dependencies for the UI.
-    \row \li \c{-n} \li Don't generate any #include directives.
-    \row \li \c{--postfix <postfix>} \li Append \c <postfix> to all generated classnames.
-    \row \li \c{--include <file>} \li Add #include \c <file> to the output.
-
+    \row \li \c{-h, --help}                    \li Displays help on commandline options.
+    \row \li \c{-v, --version}                 \li Displays version information.
+    \row \li \c{-d, --dependencies}            \li Display the dependencies.
+    \row \li \c{-o, --output <file>}           \li Place the output into \c{<file>}
+    \row \li \c{-a, --no-autoconnection}       \li Do not generate a call to \c{QObject::connectSlotsByName()}.
+    \row \li \c{-p, --no-protection}           \li Disable header protection.
+    \row \li \c{-n, --no-implicit-includes}    \li Disable generation of \c{#include-directives}.
+    \row \li \c{--postfix <postfix>}           \li Postfix to add to all generated classnames.
+    \row \li \c{--tr, --translate <function>}  \li Use <function> for i18n.
+    \row \li \c{--include <include-file>}      \li Add #include \c{<include-file>} to \c{<file>}.
+    \row \li \c{-g, --generator <python|cpp>}  \li Select generator.
+    \row \li \c{--idbased}                     \li Use id based function for i18n
+    \row \li \c{--from-imports}                \li Python: generate imports relative to \c{'.'}
     \endtable
 
     \section1 Examples