Remove qtquick-guidelines, move contents into qtquick-bestpractices

This page doesn't offer much on its own, and qtquick-bestpractices.qdoc
is already starting to gather useful guidelines, so move its contents
there. Having everything related to best practices/guidelines on one
page means less clicking between these "overview" pages, which I think
is a bit of a problem currently.

Change-Id: I18316dc177a6a7eb5a031e178cd0aed31dfa63ae
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

2 files changed, 15 insertions, 50 deletions

diff --git a/src/quick/doc/src/guidelines/qtquick-bestpractices.qdoc b/src/quick/doc/src/guidelines/qtquick-bestpractices.qdoc
index 9d411a581f..ca9bfc9ebb 100644
--- a/src/quick/doc/src/guidelines/qtquick-bestpractices.qdoc
+++ b/src/quick/doc/src/guidelines/qtquick-bestpractices.qdoc
@@ -227,4 +227,19 @@ properties are enough.
  \li \l{Item Positioners}
  \li \l{Qt Quick Layouts Overview}
 \endlist
+
+\section1 Performance
+
+For information on performance in QML and Qt Quick,
+see \l {Performance Considerations And Suggestions}.
+
+\section1 Tools and Utilities
+
+For information on useful tools and utilies that make working with QML and
+Qt Quick easier, see \l {Qt Quick Tools and Utilities}.
+
+\section1 Scene Graph
+
+For information on Qt Quick's scene graph, see \l {Qt Quick Scene Graph}.
+
 */
diff --git a/src/quick/doc/src/guidelines/qtquick-guidelines.qdoc b/src/quick/doc/src/guidelines/qtquick-guidelines.qdoc
deleted file mode 100644
index b8432fd9ca..0000000000
--- a/src/quick/doc/src/guidelines/qtquick-guidelines.qdoc
+++ /dev/null
@@ -1,50 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
-\page qtquick-guidelines.html
-\title Qt Quick Guidelines
-\brief Provides best practices and conventions for application developers
-
-Qt Quick has been the enabler that has helped developers achieve UI design
-goals faster and relieve from the monotony of imperative-coding. It is one of
-the very few UI design technologies that can be modified easily either using
-a text editor or a graphical designer tool.
-
-As an application developer, it is important to understand the limitations
-of any technology such as Qt Quick. This topic provides you the necessary insight
-into Qt Quick, and how it affects your application. It also provides pointers to best
-practices that you should try to follow, and the list of tools that helps you
-understand and improve your application.
-
-\list
-\li \l{Qt Quick Best practices}{Best Practices}
-\li \l{Qt Quick Tools and Utilities}
-\li \l{Performance Considerations And Suggestions}{Performance improvement tips}
-\li \l{Qt Quick Scene Graph}
-\endlist
-*/