diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-16 18:41:27 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-16 18:41:27 +0100 |
| commit | ff922e7b87de147797fbd759167878aec7625f0c (patch) | |
| tree | a326819f23e2421723f144522f9362ba608d6bb1 /qmake/doc/src/qmake-manual.qdoc | |
| parent | e464e1eb8eb63c631fb0916c3ea4540a88d8aad3 (diff) | |
| parent | 75f52bd0ddc4afbd181c14b310d256e3507052d6 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/corelib/kernel/qmetatype.cpp
Change-Id: I88eb0d3e9c9a38abf7241a51e370c655ae74e38a
Diffstat (limited to 'qmake/doc/src/qmake-manual.qdoc')
| -rw-r--r-- | qmake/doc/src/qmake-manual.qdoc | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc index 351009bd1c..f1e03eb407 100644 --- a/qmake/doc/src/qmake-manual.qdoc +++ b/qmake/doc/src/qmake-manual.qdoc @@ -84,7 +84,6 @@ /*! \page qmake-overview.html \title Overview - \contentspage {qmake Manual}{Contents} \previouspage qmake Manual \nextpage Getting Started @@ -158,7 +157,6 @@ /*! \page qmake-project-files.html \title Creating Project Files - \contentspage {qmake Manual}{Contents} \previouspage Getting Started \nextpage Building Common Project Types @@ -477,7 +475,6 @@ /*! \page qmake-running.html \title Running qmake - \contentspage {qmake Manual}{Contents} \previouspage Building Common Project Types \nextpage Platform Notes @@ -647,7 +644,6 @@ /*! \page qmake-platform-notes.html \title Platform Notes - \contentspage {qmake Manual}{Contents} \previouspage Running qmake \nextpage qmake Language @@ -863,7 +859,6 @@ /*! \page qmake-reference.html \title Reference - \contentspage {qmake Manual}{Contents} \previouspage Configuring qmake \nextpage Variables @@ -894,7 +889,6 @@ /*! \page qmake-variable-reference.html \title Variables - \contentspage {qmake Manual}{Contents} \previouspage Reference \nextpage Replace Functions \keyword qmake Variable Reference @@ -3189,7 +3183,6 @@ /*! \page qmake-function-reference.html \title Replace Functions - \contentspage {qmake Manual}{Contents} \previouspage Variables \nextpage Test Functions \keyword qmake Function Reference - Replace Functions @@ -3723,7 +3716,6 @@ /*! \page qmake-test-function-reference.html \title Test Functions - \contentspage {qmake Manual}{Contents} \previouspage Replace Functions \keyword qmake Function Reference - Test Functions @@ -4145,7 +4137,6 @@ /*! \page qmake-environment-reference.html - \contentspage {qmake Manual}{Contents} \previouspage Using Precompiled Headers \nextpage Reference @@ -4297,7 +4288,6 @@ /*! \page qmake-language.html \title qmake Language - \contentspage {qmake Manual}{Contents} \previouspage Platform Notes \nextpage Advanced Usage @@ -4624,7 +4614,6 @@ /*! \page qmake-advanced-usage.html \title Advanced Usage - \contentspage {qmake Manual}{Contents} \previouspage qmake Language \nextpage Using Precompiled Headers @@ -4973,7 +4962,6 @@ /*! \page qmake-precompiledheaders.html \title Using Precompiled Headers - \contentspage {qmake Manual}{Contents} \previouspage Advanced Usage \nextpage Configuring qmake @@ -5191,7 +5179,6 @@ \keyword qmake-getting-started \page qmake-tutorial.html \title Getting Started - \contentspage {qmake Manual}{Contents} \previouspage Overview \nextpage Creating Project Files @@ -5360,7 +5347,6 @@ /*! \page qmake-common-projects.html \title Building Common Project Types - \contentspage {qmake Manual}{Contents} \previouspage Creating Project Files \nextpage Running qmake |