Doc: Fix various documentation warnings

  - Cannot locate index file for dependency "qttools"
  - error: HTML file already exists; overwriting whatsnew56.html
  - firststepsqml.qdoc:27: warning: Can't link to 'Qt Quick Controls - Basic Layouts Example'
  - layouts.qdoc:27: warning: Can't link to 'Qt Quick Controls - Basic Layouts Example'

Change-Id: Ia9c328555a0199f3c219d502c2a2e4854b5a3a37
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>

4 files changed, 4 insertions, 5 deletions

diff --git a/doc/config/qtdoc.qdocconf b/doc/config/qtdoc.qdocconf
index 2c23af915..ff923e333 100644
--- a/doc/config/qtdoc.qdocconf
+++ b/doc/config/qtdoc.qdocconf
@@ -49,7 +49,6 @@ depends += \
     qtsql \
     qtsvg \
     qttestlib \
-    qttools \
     qtuitools \
     qtwebchannel \
     qtwebengine \
diff --git a/doc/src/qmlapp/firststepsqml.qdoc b/doc/src/qmlapp/firststepsqml.qdoc
index 82a50d8e4..2ad97fec6 100644
--- a/doc/src/qmlapp/firststepsqml.qdoc
+++ b/doc/src/qmlapp/firststepsqml.qdoc
@@ -178,7 +178,7 @@ buttons and sliders available. The following examples are available from
 Qt Creator and demonstrate different controls and layouts.
 
 \list
-\li \l{Qt Quick Controls - Basic Layouts Example}{Basic Layouts}
+\li \l{Qt Quick Layouts - Basic Example}{Basic Layouts}
 \li \l{Qt Quick Controls - Touch Gallery}{Touch Gallery}
 \endlist
 
diff --git a/doc/src/qmlapp/usecases/layouts.qdoc b/doc/src/qmlapp/usecases/layouts.qdoc
index 72faee972..40e8f685f 100644
--- a/doc/src/qmlapp/usecases/layouts.qdoc
+++ b/doc/src/qmlapp/usecases/layouts.qdoc
@@ -117,14 +117,14 @@ restrictions to the layout. Specifically, the layout types allow you to:
         }
     }
 \endqml
-The snippet above comes from the \l{Qt Quick Controls - Basic Layouts Example}{Basic Layouts} example. The
+The snippet above comes from the \l{Qt Quick Layouts - Basic Example}{Basic Layouts} example. The
 snippet shows the simplicity of adding various fields and items in a layout. The \l GridLayout can
 be resized and its format are customizable through various properties.
 
 For more information about the layout types, visit:
 \list
 \li \l{Qt Quick Layouts Overview}
-\li \l{Qt Quick Controls - Basic Layouts Example}{Basic Layouts} example
+\li \l{Qt Quick Layouts - Basic Example}{Basic Layouts} example
 \endlist
 
 \note \l{Qt Quick Layouts} was introduced in Qt 5.1 and requires \l{Qt Quick} 2.1.
diff --git a/doc/src/whatsnew/whatsnew57.qdoc b/doc/src/whatsnew/whatsnew57.qdoc
index 8ad42471c..995db6594 100644
--- a/doc/src/whatsnew/whatsnew57.qdoc
+++ b/doc/src/whatsnew/whatsnew57.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \page whatsnew56.html
+    \page whatsnew57.html
     \title What's New in Qt 5.7
     \brief Lists the new features in Qt 5.7.