Doc: Update Qt Enterprise information and supported platforms

Mention the availability of Qt Enterprise, Mobile Edition
on index page and whenever linking to open-source downloads
page on qt-project.org.

Also, update the following:
    - Reference platforms (OS X, Windows versions, mobile platforms)
    - Embedded platforms (Emb. Android, Qt Enterprise Embedded)
    - Divide Mobile platforms: Digia-supported & the rest
    - Mention other mobile platforms (Sailfish, Tizen, WinRT)

Task-number: QTBUG-33360
Change-Id: I36d74ca36699e24737b46af7a4a6f2736ada64af
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Sami Makkonen <sami.makkonen@digia.com>

11 files changed, 119 insertions, 10 deletions

diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
index 145e74953..4d0a382c0 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -113,3 +113,15 @@
     \externalpage http://qt.digia.com/Try-Qt-Now/
     \title Try Qt Enterprise
 */
+/*!
+    \externalpage http://qt.digia.com/
+    \title Qt Enterprise
+*/
+/*!
+    \externalpage https://sailfishos.org/
+    \title Sailfish OS
+*/
+/*!
+    \externalpage https://www.tizen.org/
+    \title Tizen
+*/
diff --git a/doc/src/getting-started/gettingstarted.qdoc b/doc/src/getting-started/gettingstarted.qdoc
index e124b08fc..af0558be2 100644
--- a/doc/src/getting-started/gettingstarted.qdoc
+++ b/doc/src/getting-started/gettingstarted.qdoc
@@ -32,10 +32,14 @@
 
     \section1 Downloading and Installing Qt
 
-    The \l{Opensource Downloads}{Downloads} page contains Qt download links,
-    where Qt and Qt Creator can be downloaded for different development
-    platforms. The Qt Enterprise packages are available from the
-    \l{Try Qt Enterprise} page.
+    Qt framework and tools can be installed using an online installer,
+    standalone binary installers or using source packages and building
+    yourself. The open-source version is found from the Qt Project
+    \l {Opensource Downloads}{Downloads} page, which contains download
+    links for Qt and Qt Creator for different development platforms.
+
+    The commercial versions are available for free trial from
+    \l{Try Qt Enterprise}{Digia}.
 
     \section2 Installing with the Installation Program
 
diff --git a/doc/src/getting-started/installer-README.qdoc b/doc/src/getting-started/installer-README.qdoc
index ac3415310..ed72f23ad 100644
--- a/doc/src/getting-started/installer-README.qdoc
+++ b/doc/src/getting-started/installer-README.qdoc
@@ -79,10 +79,10 @@ summarizes the available installers.
         \li Linux (32-bit and 64-bit)
         \li As provided by Ubuntu
     \row
-        \li Apple Mac OS X 10.7 and Mac OS X 10.8
+        \li Apple Mac OS X (10.7 and later)
         \li Clang as provided by Apple
     \row
-        \li Apple Mac OS X 10.7 and Mac OS X 10.8
+        \li Apple Mac OS X (10.7 and later)
         \li iOS 5.0 and later
     \row
         \li Microsoft Windows 7 (32-bit) ANGLE
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index 218178e3c..dd4634a64 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -60,6 +60,19 @@
                 tools easily enables developers to create applications for one
                 platform and easily build and run to deploy on another platform.
 
+                Qt Framework and tools are available under both open-source and
+                commercial licenses.
+
+                \list
+                    \li \l{Qt Homepage}{Qt Open-source}
+                    \li \l{Qt Enterprise}
+                    \li \l{Qt Enterprise}{Qt Mobile}
+                \endlist
+
+                The commercially licensed Qt Enterprise and Qt Mobile products
+                contain additional functionality and productivity tools. For
+                details, see \l{Qt Enterprise}{qt.digia.com}.
+
                 \section1 Getting Started
                 \list
                 \li \l{Getting Started with Qt}
diff --git a/doc/src/platforms/android.qdoc b/doc/src/platforms/android.qdoc
index 796b9b167..eafe63de2 100644
--- a/doc/src/platforms/android.qdoc
+++ b/doc/src/platforms/android.qdoc
@@ -107,9 +107,13 @@ to install:
 
 You can install the binary package for Qt 5.1 or later to get
 Qt for Android. The \l{Qt Installation Program}{installer} containing the
-binary packages are available for download from the
+open-source binary packages are available for download from the
 \l{Opensource Downloads}{Qt project Downloads} page.
 
+\note Enterprise packages are available from the \l{Try Qt Enterprise}
+page. Qt for Android is also available as part of Qt Mobile Edition,
+see \l{Qt Enterprise}{qt.digia.com} for details.
+
 You can also choose to build the binaries from the Qt sources, that is,
 cross-compile Qt 5.x for Android on \l{Qt for Linux/X11}{Linux (X11)}
 , \l{Qt for Windows}{Windows}, and \l{Qt for Mac OS X}{Mac OS X} platforms.
diff --git a/doc/src/platforms/ios.qdoc b/doc/src/platforms/ios.qdoc
index 457bbfc9b..23708beb7 100644
--- a/doc/src/platforms/ios.qdoc
+++ b/doc/src/platforms/ios.qdoc
@@ -61,6 +61,10 @@
         \li \l{Building Qt Sources}{Build from source}
     \endlist
 
+    \note Qt Enterprise packages are available from the \l{Try Qt Enterprise}
+    page. Qt for iOS is also available as part of the Qt Mobile Edition,
+    see \l{Qt Enterprise}{qt.digia.com} for details.
+
     Regardless of which approach you choose, you first need to install
     Xcode. You will find it in the App Store \l{Xcode}{here}. For
     running Qt applications in the simulator that comes with Xcode,
diff --git a/doc/src/platforms/linux.qdoc b/doc/src/platforms/linux.qdoc
index 81a4a810f..758968099 100644
--- a/doc/src/platforms/linux.qdoc
+++ b/doc/src/platforms/linux.qdoc
@@ -44,6 +44,9 @@
     components you want to install and follow the instructions of the
     installation program to complete the installation.
 
+    \note Qt Enterprise packages are available from the \l{Try Qt Enterprise}
+    page.
+
     The \l{Qt Installation Program} page contains the full installation
     procedure and the available installers for Linux distributions.
 
diff --git a/doc/src/platforms/macosx.qdoc b/doc/src/platforms/macosx.qdoc
index 17c0a7721..435117fd5 100644
--- a/doc/src/platforms/macosx.qdoc
+++ b/doc/src/platforms/macosx.qdoc
@@ -50,6 +50,9 @@
     runs like any executable on Mac OS X. With the installer, you can select the
     components you want.
 
+    \note Qt Enterprise packages are available from the \l{Try Qt Enterprise}
+    page.
+
     The \l{Qt Installation Program} page contains the full installation
     procedure and the available installers.
 
diff --git a/doc/src/platforms/platform-notes-qtee.qdoc b/doc/src/platforms/platform-notes-qtee.qdoc
new file mode 100644
index 000000000..7d2d76df5
--- /dev/null
+++ b/doc/src/platforms/platform-notes-qtee.qdoc
@@ -0,0 +1,38 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** 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 Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/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: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page platform-notes-qtee.html
+    \title Qt Enterprise Embedded
+
+    Qt Enterprise Embedded, available under a commercial license,
+    supports Qt development on embedded Linux and embedded Android
+    devices.
+
+    See \l http://qt.digia.com/Product/Qt-Enterprise-Embedded/ for
+    more information.
+*/
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc
index d8beeb43c..3a9655759 100644
--- a/doc/src/platforms/supported-platforms.qdoc
+++ b/doc/src/platforms/supported-platforms.qdoc
@@ -53,20 +53,37 @@
         \li \l{Qt for Mac OS X}{Mac OS X}
     \endlist
 
-    \section1 Embedded platforms
+    \section1 Embedded Platforms
     You can develop with Qt for the following embedded platforms:
     \list
+        \li \l{Qt Enterprise Embedded}{Embedded Android}
         \li Embedded Linux (DirectFB, EGLFS, KMS, and Wayland)
         \li \l{Windows CE - Introduction to using Qt}{Windows Embedded (Compact and Standard)}
         \li Real-Time Operating Systems, such as \l{QNX}, VxWorks and INTEGRITY
     \endlist
 
-    \section1 Mobile platforms
-    Qt 5 will support all leading mobile operating systems. There already exists work in progress support for:
+    \section1 Mobile Platforms
+
+    You can develop with Qt for the following mobile platforms supported
+    by Digia:
+
     \list
         \li \l{Qt for Android}{Android}
         \li \l{Qt for iOS}{iOS}
+    \endlist
+
+    The following platforms also support Qt:
+
+    \list
         \li \l{Qt for BlackBerry}{BlackBerry 10}
+        \li \l{Sailfish OS}
+    \endlist
+
+    Work in progress ports of Qt exist for:
+
+    \list
+        \li WinRT (including Windows Phone)
+        \li \l{Tizen}
     \endlist
 
     For more information about the Qt modules for mobile platforms, visit
@@ -91,10 +108,18 @@
                                      \li \l{http://sourceforge.net/projects/mingwbuilds/files/host-windows/releases/4.8.0/32-bit/threads-posix/dwarf/x32-4.8.0-release-posix-dwarf-rev1.7z}{MinGW-builds gcc 4.8.0 (32-bit)}
     \row    \li Microsoft Windows 8 (32-bit and 64-bit)
                                      \li MSVC 2012 SP2
+    \row    \li Microsoft Windows 8.1 (32-bit and 64-bit)
+                                     \li MSVC 2012 SP2
     \row    \li Apple Mac OS X 10.7 "Lion", Cocoa (64-bit)
                                      \li Clang as provided by Apple
     \row    \li Apple Mac OS X 10.8 "Mountain Lion", Cocoa (64-bit)
                                      \li Clang as provided by Apple
+    \row    \li Apple Mac OS X 10.9 "Mavericks", Cocoa (64-bit)
+                                     \li Clang as provided by Apple
+    \row    \li Apple iOS 6
+                                     \li Clang as provided by Apple
+    \row    \li Google Android 4.2
+                                     \li As provided by Google (Android NDK 4.8)
     \endtable
 
     These reference configurations are run on the continuous integration (CI)
diff --git a/doc/src/platforms/windows.qdoc b/doc/src/platforms/windows.qdoc
index 61f8021a3..a0913c701 100644
--- a/doc/src/platforms/windows.qdoc
+++ b/doc/src/platforms/windows.qdoc
@@ -48,6 +48,9 @@
     components you want to install and follow the instructions of the
     installation program to complete the installation.
 
+    \note Qt Enterprise packages are available from the \l{Try Qt Enterprise}
+    page.
+
     The \l{Qt Installation Program} page contains the full installation
     procedure and the available installers for the different Windows versions.