diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-12-07 08:53:11 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-12-07 08:53:11 +0100 |
| commit | e5c2ee922a6cdac5252885a6f7938e1597fe042e (patch) | |
| tree | aaf53359d0183fbfa76ca9f570aa765e7a2b8154 /doc | |
| parent | 9d708f776fc0368b1150b4986318fb316a04336b (diff) | |
| parent | 3e9d7d290c278b8043b7eb6d346c69c27173a506 (diff) | |
Merge remote-tracking branch 'origin/4.8'
Conflicts:
src/plugins/cpptools/compileroptionsbuilder.cpp
Change-Id: I743ea39480cc5c7b6febcd2e93713d15a3ae6d9c
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/cmake/creator-projects-cmake.qdoc | 5 | ||||
| -rw-r--r-- | doc/src/qtquick/qtquick-components.qdoc | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/doc/src/cmake/creator-projects-cmake.qdoc b/doc/src/cmake/creator-projects-cmake.qdoc index 022d8a9af4..2a29cac9c1 100644 --- a/doc/src/cmake/creator-projects-cmake.qdoc +++ b/doc/src/cmake/creator-projects-cmake.qdoc @@ -125,8 +125,9 @@ in the \c {Modules} directory of your CMake installation. \note If you provide your own libraries, you also need to provide your own - \c {FindFoo.cmake} file. For more information, see - \l{http://vtk.org/Wiki/CMake_FAQ#Writing_FindXXX.cmake_files}{CMake FAQ}. + \c {FindXXX.cmake} file. For more information, see + \l{https://gitlab.kitware.com/cmake/community/wikis/FAQ#writing-findxxxcmake-files} + {Writing FindXXX.cmake files}. Syntax completion and highlighting work once your project successfully builds and links against the external library. diff --git a/doc/src/qtquick/qtquick-components.qdoc b/doc/src/qtquick/qtquick-components.qdoc index a5cb902760..7a83860c72 100644 --- a/doc/src/qtquick/qtquick-components.qdoc +++ b/doc/src/qtquick/qtquick-components.qdoc @@ -427,6 +427,7 @@ \endlist \if defined(qtdesignstudio) + \include qtdesignstudio-visual-effects.qdocinc qml visual effects \include qtdesignstudio-components.qdocinc creating studio components \include qtdesignstudio-components.qdocinc studio components \endif |