summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJuha Vuolle <juha.vuolle@insta.fi>2021-07-30 08:47:46 +0300
committerJuha Vuolle <juha.vuolle@insta.fi>2021-08-10 12:09:38 +0300
commit3baa625b2819fbf13dc6b512c377a1a5998ca7f9 (patch)
treefa6cdac4a3e87522dc978b12276c23f308d0d097 /tools
parent181fa551fc4e83ce50afc5508b2b736ccc556488 (diff)
Rename qscxmlc CMake options
Renaming as a result of CMake API review. The old option names are still supported but marked as deprecated. [ChangeLog] Rename QSCXMLC_ARGUMENTS and OUTPUT_DIR CMake variables to be better aligned with other CMake APIs (OPTIONS and OUTPUT_DIRECTORY respectively). Pick-to: 6.2 Task-number: QTBUG-95178 Change-Id: I8500dd4e1d992ccba7378d37cda65d9760558dc5 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'tools')
-rw-r--r--tools/qscxmlc/doc/qscxmlc.qdoc17
1 files changed, 10 insertions, 7 deletions
diff --git a/tools/qscxmlc/doc/qscxmlc.qdoc b/tools/qscxmlc/doc/qscxmlc.qdoc
index 2372440..c725ddf 100644
--- a/tools/qscxmlc/doc/qscxmlc.qdoc
+++ b/tools/qscxmlc/doc/qscxmlc.qdoc
@@ -73,8 +73,7 @@
\section1 Command-Line Options
- The \c qscxmlc tool supports the following command-line options, which can be specified using
- the \c QSCXMLC_ARGUMENTS variable in the project file:
+ The \c qscxmlc tool supports the following command-line options:
\table
\header
@@ -105,20 +104,24 @@
a state is currently active.
\endtable
- In addition to \c QSCXMLC_ARGUMENTS options, the \c qmake and \c CMake project files support
- the following options:
+ The \c qmake and \c CMake project files support the following options:
\table
\header
\li Option
\li Description
\row
- \li \c {QSCXMLC_DIR|OUTPUT_DIR <directory>}
- \li \c QSCXMLC_DIR (qmake) or \c OUTPUT_DIR (cmake) specifies the directory for the output
- files.
+ \li \c {QSCXMLC_DIR|OUTPUT_DIRECTORY <directory>}
+ \li \c QSCXMLC_DIR (qmake) or \c OUTPUT_DIRECTORY (cmake) specifies the directory for
+ the output files. OUTPUT_DIR (cmake) has been deprecated.
\row
\li \c {QSCXMLC_NAMESPACE|NAMESPACE <namespace>}
\li \c QSCXMLC_NAMESPACE (qmake) or \c NAMESPACE (cmake) specifies the namespace for the
generated classes.
+ \row
+ \li \c {QSCXMLC_ARGUMENTS|OPTIONS <options>}
+ \li \c QSCXMLC_ARGUMENTS (qmake) or \c OPTIONS (cmake) allows specifying additional
+ options for the \c qscxmlc compiler. QSCXMLC_ARGUMENTS with cmake has been
+ deprecated.
\endtable
*/