diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-10-24 15:19:33 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-10-25 12:04:37 +0300 |
| commit | 6d67c30eefc6c84de5abc1d95006b2d59cbd3d46 (patch) | |
| tree | 5ce36c965ae121a6d043d533480158c23871aa47 | |
| parent | 5d4ba35bc917bc5a48b60da5a4c2cbd03ff4bbf4 (diff) | |
| parent | 6e316ceadf15b4af01eb1f5db1a2a36eee5766cb (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
* origin/5.11:
6e316ce Doc: Fix typo in file name
36dc731 Doc: Fix landing page title
Change-Id: I72348c7037b53d5996a862adfbd6677fa331bd68
| -rw-r--r-- | src/doc/src/qtdeviceutilities-index.qdoc | 2 | ||||
| -rw-r--r-- | src/doc/src/qtdeviceutilities-module-cpp.qdoc (renamed from src/doc/src/qtdeviceutitilies-module-cpp.qdoc) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/doc/src/qtdeviceutilities-index.qdoc b/src/doc/src/qtdeviceutilities-index.qdoc index af4d26e..ed07853 100644 --- a/src/doc/src/qtdeviceutilities-index.qdoc +++ b/src/doc/src/qtdeviceutilities-index.qdoc @@ -27,7 +27,7 @@ /*! \page qtdeviceutilities-index.html - \title Qt Device Utilities + \maintitle \brief Provides functionality that is useful for embedded applications. \section1 Getting Started diff --git a/src/doc/src/qtdeviceutitilies-module-cpp.qdoc b/src/doc/src/qtdeviceutilities-module-cpp.qdoc index caa9346..caa9346 100644 --- a/src/doc/src/qtdeviceutitilies-module-cpp.qdoc +++ b/src/doc/src/qtdeviceutilities-module-cpp.qdoc |