Clean up some references to Qt 5 in docs

In several places, "Qt 5" is treated as the brand name,
and should be replaced with just "Qt". The documentation is
part of the repository, so no need to specify the major
release series in the documentation unless we want to refer
to something that changed in a specific version.

Task-number: QTBUG-85207
Change-Id: I6799af72f1d0e06307a724345fb3ef5cbd8ac985
Reviewed-by: Paul Wicking <paul.wicking@qt.io>

19 files changed, 40 insertions, 46 deletions

diff --git a/doc/src/classes.qdoc b/doc/src/classes.qdoc
index 8ddf3638..108c9fe6 100644
--- a/doc/src/classes.qdoc
+++ b/doc/src/classes.qdoc
@@ -50,7 +50,7 @@
 
     \brief If you know the name of the class you want, find it here.
 
-    This is a list of all Qt 5 classes. The following pages contain different
+    This is a list of all Qt classes. The following pages contain different
     API listings in different categories:
 
     \list
diff --git a/doc/src/configure.qdoc b/doc/src/configure.qdoc
index 6e6e7dbb..8f1fc938 100644
--- a/doc/src/configure.qdoc
+++ b/doc/src/configure.qdoc
@@ -219,7 +219,7 @@
     The following pages provide guidelines on how to configure Qt for specific
     platform development:
     \list
-    \li \l{Building Qt 5 for Android} Wiki page
+    \li \l{Building Qt for Android} Wiki page
     \li \l{Qt for iOS - Building from Source}
     \li \l{Configure an Embedded Linux Device}
     \li \l{http://wiki.qt.io/Qt_RaspberryPi}{Qt for Raspberry Pi} - a community-driven site for
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
index 2e91b94c..4c1e443b 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -346,7 +346,7 @@
 */
 /*!
     \externalpage http://wiki.qt.io/Qt5ForAndroidBuilding
-    \title Building Qt 5 for Android
+    \title Building Qt for Android
 */
 
 /*!
diff --git a/doc/src/getting-started/gettingstarted.qdoc b/doc/src/getting-started/gettingstarted.qdoc
index f4fe5195..c7d67948 100644
--- a/doc/src/getting-started/gettingstarted.qdoc
+++ b/doc/src/getting-started/gettingstarted.qdoc
@@ -132,7 +132,7 @@
     UIs.
 
     For a more thorough walkthrough of the different aspects of developing
-    applications with Qt 5, see the \l {QML Book}. It focuses on Qt Quick,
+    applications with Qt, see the \l {QML Book}. It focuses on Qt Quick,
     but also provides the information needed to use QML together with C++.
 
     \section1 Explore Qt
diff --git a/doc/src/getting-started/gettingstartedqml.qdoc b/doc/src/getting-started/gettingstartedqml.qdoc
index 1d033139..64743afc 100644
--- a/doc/src/getting-started/gettingstartedqml.qdoc
+++ b/doc/src/getting-started/gettingstartedqml.qdoc
@@ -53,8 +53,8 @@
     \image addalarms.png "Add alarms"
 
     The source files are located in the qtdoc repository.
-    You can either fetch the Qt 5 sources from the Qt Project,
-    or install them as part of Qt 5. The application is also available
+    You can either fetch the Qt sources from the Qt Project,
+    or install them as part of Qt. The application is also available
     in the example list of Qt Creator's Welcome mode.
 
     \section1 Creating the Alarms Project
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 59b7c8e0..caa00233 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -36,7 +36,7 @@ There are two ways to install Qt:
 \li through the \e{Qt sources}.
 \endlist
 
-You can download the Qt 5 installers and sources from the \l Downloads page.
+You can download the Qt installers and sources from the \l Downloads page.
 For more information, visit the \l{Getting Started with Qt} page.
 
 This page lists the relevant information for installing Qt by building the Qt
diff --git a/doc/src/graphics.qdoc b/doc/src/graphics.qdoc
index d4a5eac8..c7bb6c67 100644
--- a/doc/src/graphics.qdoc
+++ b/doc/src/graphics.qdoc
@@ -30,9 +30,9 @@
 \title Graphics
 \brief Qt's graphics features
 
-Graphics in Qt 5 is primarily done either through the imperative QPainter API,
+Graphics in Qt is primarily done either through the imperative QPainter API,
 or through Qt’s declarative UI language, Qt Quick, and its scene graph back-end.
-Qt 5's graphics capabilities also includes support for printing, as well as the
+Qt's graphics capabilities also includes support for printing, as well as the
 loading and saving of various image formats.
 
 
@@ -132,12 +132,6 @@ applications, as well as add-on modules for displaying 3D content.
 
 \endlist
 
-Prior to Qt 5.0, OpenGL support in Qt was handled by the \l {Qt OpenGL}
-module. This module is still present, but new code should aim to use
-the new classes in the \l {Qt GUI} module. The classes are easily distinguisible
-based on their names: Classes with the \c QGL prefix should not be used. Instead,
-prefer the ones starting with \c QOpenGL.
-
 
 
 \section1 Qt Quick Scene Graph
diff --git a/doc/src/internationalization/i18n.qdoc b/doc/src/internationalization/i18n.qdoc
index f5058b2f..899c0dd4 100644
--- a/doc/src/internationalization/i18n.qdoc
+++ b/doc/src/internationalization/i18n.qdoc
@@ -214,9 +214,9 @@
     applications from Qt 4 to Qt 5 easier. The meta catalog depends on
     translations that might be absent, because they belong to unnecessary or
     deprecated modules, which might cause the loading of the translations to
-    fail. If you use modules that are new in Qt 5 in your application, you must
-    specify the names of the catalogs for those modules even if you use the
-    meta catalog.
+    fail. If you use modules that are new in Qt 5 or later in your application,
+    you must specify the names of the catalogs for those modules even if you
+    use the meta catalog.
 
     The following table lists the translation catalogs available for the Qt
     modules and tools in Qt.
diff --git a/doc/src/modules-cpp.qdoc b/doc/src/modules-cpp.qdoc
index 20babb44..187d7e45 100644
--- a/doc/src/modules-cpp.qdoc
+++ b/doc/src/modules-cpp.qdoc
@@ -29,9 +29,9 @@
     \title All Classes by Module
     \ingroup classlists
 
-    \brief A list of all C++ API components in Qt 5
+    \brief A list of all C++ API components in Qt
 
-    These are the C++ API pages for Qt 5's \l{All Modules}{modules}. For
+    These are the C++ API pages for Qt's \l{All Modules}{modules}. For
     a list of all classes on a single page, visit the \l{All Classes} page.
 
     \annotatedlist {modules}
diff --git a/doc/src/modules-qml.qdoc b/doc/src/modules-qml.qdoc
index 3db05379..25862248 100644
--- a/doc/src/modules-qml.qdoc
+++ b/doc/src/modules-qml.qdoc
@@ -31,9 +31,9 @@
     \ingroup classlists
     \title All QML Modules
 
-    \brief A list of all QML modules in Qt 5.
+    \brief A list of all QML modules in Qt.
 
-    These are the QML API pages for Qt 5's QML modules.
+    These are the QML API pages for Qt's QML modules.
 
     \generatelist qml-modules
 */
diff --git a/doc/src/platforms/android/android-building.qdoc b/doc/src/platforms/android/android-building.qdoc
index eec14a72..390e2cf1 100644
--- a/doc/src/platforms/android/android-building.qdoc
+++ b/doc/src/platforms/android/android-building.qdoc
@@ -36,7 +36,7 @@
     going through this guide. Accomplish the tasks in
     \l{Getting Started with Qt for Android} first.
 
-    You can download the Qt 5 sources from the \l Downloads page.
+    You can download the Qt sources from the \l Downloads page.
 
     \section1 Building on Linux
 
diff --git a/doc/src/platforms/android/android.qdoc b/doc/src/platforms/android/android.qdoc
index ae97c94d..c1322b45 100644
--- a/doc/src/platforms/android/android.qdoc
+++ b/doc/src/platforms/android/android.qdoc
@@ -33,7 +33,7 @@
 \previouspage android_runtime_licensing_notes.html
 \nextpage android-getting-started.html
 
-Qt for Android enables you to run Qt 5 applications on Android devices.
+Qt for Android enables you to run Qt applications on Android devices.
 All Qt modules (essentials and add-ons) are supported except the following:
 
 \list
diff --git a/doc/src/platforms/apple-getting-started.qdocinc b/doc/src/platforms/apple-getting-started.qdocinc
index d5a8cf44..8a536e64 100644
--- a/doc/src/platforms/apple-getting-started.qdocinc
+++ b/doc/src/platforms/apple-getting-started.qdocinc
@@ -40,7 +40,7 @@
 
     \section2 Setting Up the Development Environment
 
-    You can download the Qt 5 installers from the \l Downloads page.
+    You can download the Qt installers from the \l Downloads page.
     For more information, see \l{Getting Started with Qt}.
 
     Before installing Qt, you first need to install
diff --git a/doc/src/platforms/ios.qdoc b/doc/src/platforms/ios.qdoc
index 85b7d90c..13aea6bd 100644
--- a/doc/src/platforms/ios.qdoc
+++ b/doc/src/platforms/ios.qdoc
@@ -72,10 +72,10 @@
     \gui Preferences > \gui Downloads > \gui Components >
     \gui {Command Line Tools}.
 
-    Qt 5 sources can be obtained either by cloning the repositories or
+    Qt sources can be obtained either by cloning the repositories or
     downloading the source package(s).
 
-    We can then configure and build Qt. This is done from the Qt 5 top
+    We can then configure and build Qt. This is done from the Qt top
     directory:
 
     \badcode
diff --git a/doc/src/platforms/linux.qdoc b/doc/src/platforms/linux.qdoc
index d15abf51..c09c3600 100644
--- a/doc/src/platforms/linux.qdoc
+++ b/doc/src/platforms/linux.qdoc
@@ -74,9 +74,9 @@
     sudo zypper install -t pattern devel_basis
     \endcode
 
-    \section1 Building Qt 5 from Source
+    \section1 Building Qt from Source
 
-    You can also build Qt 5 from the source package and configure it according
+    You can also build Qt from the source package and configure it according
     to your target platform. The source packages are obtained from
     \l{http://www.qt.io/download/}.
 
@@ -373,7 +373,7 @@
     \title Qt for Linux/X11 - Building from Source
     \brief How to configure and build Qt on Linux/X11 platforms.
 
-    You can download the Qt 5 sources from the \l Downloads page. For more
+    You can download the Qt sources from the \l Downloads page. For more
     information, visit the \l{Getting Started with Qt} page.
 
     Qt for X11 has some requirements that are given in more detail
@@ -754,7 +754,7 @@
     \section2 Qt Plugins
 
     All Qt GUI applications require a plugin that implements the \l {Qt
-    Platform Abstraction} (QPA) layer in Qt 5. For Linux/X11, the name of the
+    Platform Abstraction} (QPA) layer in Qt. For Linux/X11, the name of the
     platform plugin is \c {libqxcb.so}. This file must be located within a
     specific subdirectory (by default, \c platforms) under your distribution
     directory. Alternatively, it is possible to adjust the search path Qt
diff --git a/doc/src/platforms/macos.qdoc b/doc/src/platforms/macos.qdoc
index c213a679..3ad1acfd 100644
--- a/doc/src/platforms/macos.qdoc
+++ b/doc/src/platforms/macos.qdoc
@@ -203,7 +203,7 @@
     image (.dmg file) that the user can mount in Finder. The deployment tool, \c
     macdeployqt (available from the \macos installers), can be used to create
     the self-contained bundles, and optionally also create a .dmg archive.
-    Applications can also be distributed through the Mac App Store. Qt 5 aims
+    Applications can also be distributed through the Mac App Store. Qt aims
     to stay within the app store sandbox rules. macdeployqt (bin/macdeployqt)
     can be used as a starting point for app store deployment.
 
@@ -278,7 +278,7 @@
     \section1 Steps for Building
 
     The following instructions describe how to build Qt from the source package.
-    You can download the Qt 5 sources from the \l{Downloads} page. For
+    You can download the Qt sources from the \l{Downloads} page. For
     more information, visit the \l{Getting Started with Qt} page.
 
     \section2 Step 1: Install the License File (Commercially Licensed Qt Only)
@@ -607,7 +607,7 @@
     \li \c Q_OS_MACOS is defined when you are on an \macos system.
     \endlist
 
-    \note \c Q_WS_MAC is no longer defined in Qt 5.
+    \note \c Q_WS_MAC is no longer defined in Qt 5 and later.
 
     If you want to define code for specific versions of \macos, use
     the availability macros defined in \e{/usr/include/AvailabilityMacros.h}.
@@ -1112,7 +1112,7 @@
     \section2 Qt Plugins
 
     All Qt GUI applications require a plugin that implements the \l {Qt
-    Platform Abstraction} (QPA) layer in Qt 5. For \macos, the name of the
+    Platform Abstraction} (QPA) layer in Qt. For \macos, the name of the
     platform plugin is \c {libqcocoa.dylib}. This file must be located within a
     specific subdirectory (by default, \c platforms) under your distribution
     directory. Alternatively, it is possible to adjust the search path Qt
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc
index 1090f0e8..784fca19 100644
--- a/doc/src/platforms/supported-platforms.qdoc
+++ b/doc/src/platforms/supported-platforms.qdoc
@@ -47,7 +47,7 @@
     \l [QtWidgets] {Qt Widgets}{Widgets} can be used without
     hardware acceleration.
 
-    In Qt 5 all platforms are created using the \l{Qt Platform Abstraction}
+    Since Qt 5, all platforms are created using the \l{Qt Platform Abstraction}
     (QPA), which makes it easy to port Qt into a new operating system.
 
     The following platforms are supported in Qt \qtver. For support information
@@ -91,7 +91,7 @@
 
     \section1 Availability of Packages
 
-    You can download the Qt 5 installers and source packages from the \l Downloads page.
+    You can download the Qt installers and source packages from the \l Downloads page.
     For more information, visit the \l{Getting Started with Qt} page.
 
     \note All the supported configurations are not provided as binary packages
diff --git a/doc/src/platforms/windows.qdoc b/doc/src/platforms/windows.qdoc
index 659a5df6..90a60281 100644
--- a/doc/src/platforms/windows.qdoc
+++ b/doc/src/platforms/windows.qdoc
@@ -94,14 +94,14 @@
 
     \section1 Libraries
 
-    The following third-party libraries may be used when running Qt 5
+    The following third-party libraries may be used when running Qt
     applications on Windows.
 
     \list
         \li \l{OpenSSL Toolkit}: Qt can make use of OpenSSL to support Secure Socket Layer
            (SSL) communication.
 
-        \li \l{ICU}: Qt 5 can make use of the ICU library for enhanced UNICODE and Globalization
+        \li \l{ICU}: Qt can make use of the ICU library for enhanced UNICODE and Globalization
            support (see QTextCodec, QCollator::setNumericMode()).
 
            At compile time, the \e include and \e lib folders of the ICU installation must
@@ -406,8 +406,8 @@
 
     \section1 Building from Source
 
-    These tools are not needed to run Qt 5 applications, but they are required
-    for building Qt 5 from source.
+    These tools are not needed to run Qt applications, but they are required
+    for building Qt from source.
 
     \list
         \li \l ActivePerl - Install a recent version of ActivePerl
@@ -421,7 +421,7 @@
            in the path before the perl executable provided by msysgit, since the
            latter is outdated.
 
-    For instructions for building the Qt 5 source, read
+    For instructions for building the Qt source, read
     the \l{Qt for Windows - Building from Source} page.
 
     \section1 Compilers
@@ -999,7 +999,7 @@
     \section2 Qt Plugins
 
     All Qt GUI applications require a plugin that implements the \l {Qt
-    Platform Abstraction} (QPA) layer in Qt 5. For Windows, the name of the
+    Platform Abstraction} (QPA) layer in Qt. For Windows, the name of the
     platform plugin is \c {qwindows.dll}. This file must be located within a
     specific subdirectory (by default, \c platforms) under your distribution
     directory. Alternatively, it is possible to adjust the search path Qt
@@ -1080,7 +1080,7 @@
     \l{Qt for Windows}. Before building, there are some requirements that are
     given in more detail in the \l{Qt for Windows - Requirements} document.
 
-    You can download the Qt 5 sources from the \l{Downloads} page. For
+    You can download the Qt sources from the \l{Downloads} page. For
     more information, visit the \l{Getting Started with Qt} page.
 
 
@@ -1142,7 +1142,7 @@
     \section1 Step 4: Build the Qt Library
 
         The default behavior of configure is to create an in-source build
-        of Qt 5. If you want to install Qt 5 to a separate location,
+        of Qt. If you want to install Qt to a separate location,
         you need to specify the command line option \c{-prefix <location>}.
         Alternatively, the command line option \c -developer-build creates
         an in-source build for developer usage.
diff --git a/doc/src/qmlapp/applicationdevelopers.qdoc b/doc/src/qmlapp/applicationdevelopers.qdoc
index d0a69c17..0e0030de 100644
--- a/doc/src/qmlapp/applicationdevelopers.qdoc
+++ b/doc/src/qmlapp/applicationdevelopers.qdoc
@@ -201,7 +201,7 @@ exposed to QML through other modules. If you require the functionality of those
 modules, you should browse their QML documentation.
 
 The \l{All QML APIs by Module} contains a list of all QML modules
-in Qt 5.
+in Qt.
 
 \section1 Related Topics