summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/config/images/qt-codesample.pngbin5048 -> 6104 bytes
-rw-r--r--doc/src/configure.qdoc4
-rw-r--r--doc/src/external-resources.qdoc5
-rw-r--r--doc/src/getting-started/gettingstarted.qdoc3
-rw-r--r--doc/src/getting-started/installation.qdoc3
-rw-r--r--doc/src/index.qdoc2
-rw-r--r--doc/src/platforms/linux.qdoc2
-rw-r--r--doc/src/platforms/osx.qdoc3
-rw-r--r--doc/src/platforms/supported-platforms.qdoc43
-rw-r--r--doc/src/platforms/windows.qdoc9
-rw-r--r--doc/src/qmlapp/usecases/styling.qdoc2
11 files changed, 52 insertions, 24 deletions
diff --git a/doc/config/images/qt-codesample.png b/doc/config/images/qt-codesample.png
index e798ae244..6b76c0486 100644
--- a/doc/config/images/qt-codesample.png
+++ b/doc/config/images/qt-codesample.png
Binary files differ
diff --git a/doc/src/configure.qdoc b/doc/src/configure.qdoc
index d238accc0..6bffee92b 100644
--- a/doc/src/configure.qdoc
+++ b/doc/src/configure.qdoc
@@ -186,8 +186,8 @@
The \c -platform option sets the host platform and the compiler for building
the Qt sources. The list of supported platforms and compilers is found in
- the \l{Supported Platforms} page while the full list is listed in
- \e{qtbase/mkspecs}.
+ the \l{Community Supported Platforms}{supported platforms} page while the
+ full list is available in \e{qtbase/mkspecs} directory.
For example, on Ubuntu Linux systems, Qt can be compiled by several
compilers such as clang or g++:
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
index f0c832e49..6a7309ab5 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -272,3 +272,8 @@
\externalpage http://doc.qt.io/qt-5/qtcanvas3d-index.html
\title Qt Canvas 3D
*/
+
+/*!
+ \externalpage http://doc.qt.io/QtSupportedPlatforms/index.html
+ \title Officially Supported Platforms
+*/
diff --git a/doc/src/getting-started/gettingstarted.qdoc b/doc/src/getting-started/gettingstarted.qdoc
index 5054593b3..960a1582b 100644
--- a/doc/src/getting-started/gettingstarted.qdoc
+++ b/doc/src/getting-started/gettingstarted.qdoc
@@ -73,7 +73,8 @@
\li \l{Windows CE - Introduction to using Qt}{WinCE}
\endlist
- For more information, visit the \l{Supported Platforms} page.
+ For more information, visit the \l{Community Supported Platforms}
+ {supported platforms} page.
\section1 Explore Qt
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 42c6abc2e..c7cc07dff 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -41,7 +41,8 @@ For more information, visit the \l{Getting Started with Qt} page.
This page lists the relevant information for installing Qt by building the Qt
sources. The installation procedure is different on each Qt platform. This page
-collects the relevant information for the \l{Supported Platforms}.
+collects the relevant information for the \l{Community Supported Platforms}
+{supported platforms}.
\section1 General Installation Information
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index a028bb779..fb185ec2c 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -94,7 +94,7 @@
\li \l{Getting Started with Qt}
\li \l{What's New in Qt 5}
\li \l{Qt Examples and Tutorials}{Examples and Tutorials}
- \li \l{Supported Platforms}
+ \li \l{Community Supported Platforms}{Supported Platforms}
\li \l{Qt Licensing}
\endlist
\enddiv
diff --git a/doc/src/platforms/linux.qdoc b/doc/src/platforms/linux.qdoc
index ba186b90e..859e8668d 100644
--- a/doc/src/platforms/linux.qdoc
+++ b/doc/src/platforms/linux.qdoc
@@ -791,7 +791,7 @@
Linux/x86, Linux/ppc, Linux/amd64 and Linux/ia64 (including Altix(R)).
For information about the specific compilers supported, visit the
- \l{Supported Platforms} page.
+ \l{Community Supported Platforms#Reference Configurations}{supported platforms} page.
\section2 Installation problems
diff --git a/doc/src/platforms/osx.qdoc b/doc/src/platforms/osx.qdoc
index b11104e39..c64d8b915 100644
--- a/doc/src/platforms/osx.qdoc
+++ b/doc/src/platforms/osx.qdoc
@@ -174,7 +174,8 @@
Qt for OS X is tested and compatible with several versions of GCC (GNU
Compiler Collection) and Clang (as available from Xcode). For a list of
tested configurations, refer to the \e{Reference Configuration} section of
- the \l{Supported Platforms} page.
+ the \l{Community Supported Platforms#Reference Configurations}{supported platforms}
+ page.
\section2 OS X on PowerPC hardware
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc
index 4fa5644c0..6d5f65350 100644
--- a/doc/src/platforms/supported-platforms.qdoc
+++ b/doc/src/platforms/supported-platforms.qdoc
@@ -26,26 +26,43 @@
****************************************************************************/
/*!
+ \keyword Supported Platforms
\page supported-platforms.html
- \title Supported Platforms
+ \title Community Supported Platforms
\brief The platforms supported by Qt.
- Qt is a cross-platform application and UI framework. Using Qt,
- you can write GUI applications once and deploy them
+ Qt is a commercial and open source licensed cross-platform application
+ and UI framework. It is developed by The Qt Company, a solely owned
+ entity of Digia Plc, together with the Qt Project Community under an
+ open source governance model.
+
+ Using Qt, you can write GUI applications once and deploy them
across desktop, mobile and embedded operating systems without
- rewriting the source code.In Qt 5 all platforms are created using
- the new \l{Qt Platform Abstraction} (QPA), which makes it easier
- than before to port Qt into a new operating system.
+ rewriting the source code.
Qt is supported on a variety of 32-bit and 64-bit platforms,
and can usually be built on each platform with GCC, a vendor-supplied
- compiler, or a third party compiler. Open GL (ES) 2.0 or
- DirectX 9 (with ANGLE) is required for Qt Quick 2. Widgets and
- Qt Quick 1 can be used also without hardware acceleration.
+ compiler, or a third party compiler. Open GL (ES) 2.0,
+ DirectX 9 (with ANGLE), or an \l {Qt Quick 2D Renderer} {alternative
+ renderer} is required for \l [QtQuick] {Qt Quick} 2.
+ \l [QtWidgets] {Qt Widgets}{Widgets} can be used also without
+ hardware acceleration.
+
+ Not all platforms supported by the Community are supported by The
+ Qt Company, and vice versa.
+
+ \list
+ \li \l {Officially Supported Platforms} - Platforms supported
+ by The Qt Company.
+ \endlist
+
+ In Qt 5 all platforms are created using the
+ \l{Qt Platform Abstraction} (QPA), which makes it easier
+ than before to port Qt into a new operating system.
\section1 Desktop Platforms
- You can develop with Qt on the following desktop platforms:
+ You can develop with Qt for the following desktop platforms:
\list
\li \l{Qt for Windows}{Windows}
@@ -65,7 +82,7 @@
\section1 Mobile Platforms
You can develop with Qt for the following mobile platforms supported
- by Digia:
+ by The Qt Company:
\list
\li \l{Qt for Android}{Android}
@@ -160,7 +177,7 @@
\li Clang as provided by Apple
\endtable
- Digia, Qt partners, open source projects and community users
+ The Qt Company, Qt partners, open source projects and community users
are able to provide assistance with various different supported
platforms and configurations.
@@ -190,7 +207,7 @@
Please note that Qt is offered on an "as is" basis without warranty
of any kind and that our products are not error or bug free. To the maximum extent
- permitted by applicable law, Digia on behalf of itself and its suppliers, disclaims all
+ permitted by applicable law, The Qt Company on behalf of itself and its suppliers, disclaims all
warranties and conditions, either express or implied, including, but not limited to,
implied warranties of merchantability, fitness for a particular purpose, title and
non-infringement with regard to the Licensed Software.
diff --git a/doc/src/platforms/windows.qdoc b/doc/src/platforms/windows.qdoc
index 0b998b807..1d3a6fc01 100644
--- a/doc/src/platforms/windows.qdoc
+++ b/doc/src/platforms/windows.qdoc
@@ -35,8 +35,9 @@
Before you get started, ensure that your development environment fulfills
the \l{Qt for Windows Requirements}{requirements}.
- The \e{Reference Configuration} section of the \l{Supported Platforms} page
- contains the list of Windows version and the compiler tested to work with
+ The \e{Reference Configuration} section of the
+ \l{Community Supported Platforms#Reference Configurations}{supported platforms}
+ page contains a list of Windows versions and compilers tested to work with
Qt.
\section1 Downloading and Installing Qt
@@ -403,7 +404,9 @@
to build Qt including Qt WebKit.
For more information about the MinGW builds, visit the
- \e{Reference Configuration} section of the \l{Supported Platforms} page.
+ \e{Reference Configuration} section of the
+ \l{Community Supported Platforms#Reference Configurations}{supported platforms}
+ page.
\section1 Intel C++ Compiler (Windows, Altix)
diff --git a/doc/src/qmlapp/usecases/styling.qdoc b/doc/src/qmlapp/usecases/styling.qdoc
index 0438ccb0f..b36896f39 100644
--- a/doc/src/qmlapp/usecases/styling.qdoc
+++ b/doc/src/qmlapp/usecases/styling.qdoc
@@ -35,7 +35,7 @@ Qt Quick's \l{Models and Views in Qt Quick}{delegates} the visual type attaches
to the \e delegate property.
When using \l{Qt Quick Controls}, the controls automatically set
-the appropriate style from the respective \l{Supported Platforms}{platforms}.
+the appropriate style from the respective \l{Community Supported Platforms}{platforms}.
\section1 Using the Styling QML Types
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 18:10:52 +0000