summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorKai Köhne <kai.koehne@qt.io>2021-02-17 17:30:28 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-05-05 18:31:35 +0000
commit61f56d9bb73ea6a273f90fe83f6013b4a698048e (patch)
tree1ee7d1cff11a0ae381e4fd50c9c047e2c901b9b8 /qmake
parentfdbff1a8c65030a06c30d6d76fa3da7aaab117b5 (diff)
doc: Mention qmake6 as name of qmake executable on Linux
Task-number: QTBUG-89170 Change-Id: I16c86f04b4c34e7099c220cf028ba1cdb20550e9 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit fb56cf449b665aa5c9cfd88a92937279a7dd8a54) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'qmake')
-rw-r--r--qmake/doc/src/qmake-manual.qdoc6
1 files changed, 6 insertions, 0 deletions
diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc
index 5939a48150..c097756be8 100644
--- a/qmake/doc/src/qmake-manual.qdoc
+++ b/qmake/doc/src/qmake-manual.qdoc
@@ -490,6 +490,9 @@
\snippet code/doc_src_qmake-manual.pro 8
+ \note If you installed Qt via a package manager, the binary
+ may be \c{qmake6}.
+
\section1 Operating Modes
qmake supports two different modes of operation. In the default mode, qmake
@@ -5389,6 +5392,9 @@
\snippet code/doc_src_qmake-manual.pro 114
+ \note If you installed Qt via a package manager, the binary
+ may be \c{qmake6}.
+
Then type \c make or \c nmake depending on the compiler you use.
For Visual Studio users, qmake can also generate Visual Studio project