diff --git a/doc/config/qtdoc.qdocconf b/doc/config/qtdoc.qdocconf
index 2bc33f992a14a80f286716af7806fedeb51f84f4..5109a4367557e94f4cee1480a394bafd4f1275b6 100644
--- a/doc/config/qtdoc.qdocconf
+++ b/doc/config/qtdoc.qdocconf
@@ -99,3 +99,6 @@ qhp.QtDoc.subprojects.examples.sortPages = true
# Add an image used in example manifests to qhp
HTML.extraimages += images/qt-codesample.png
qhp.QtDoc.extraFiles += images/qt-codesample.png
+
+# Add an .html file with sidebar content, used in the online style
+HTML.stylesheets += style/qt5-sidebar.html
diff --git a/doc/config/style/qt5-sidebar.html b/doc/config/style/qt5-sidebar.html
new file mode 100644
index 0000000000000000000000000000000000000000..2315cffd420f8b181ccbc7944e6538be2bdcabad
--- /dev/null
+++ b/doc/config/style/qt5-sidebar.html
@@ -0,0 +1,50 @@
+<div class="sectionlist normallist">
+ <div class="heading">
+ <a name="reference"></a>
+ <h2 id="reference">Reference</h2>
+ </div>
+ <div class="indexboxcont indexboxbar">
+ <ul>
+ <li><a href="classes.html">All Qt C++ Classes</a></li>
+ <li><a href="qmltypes.html">All QML Types</a></li>
+ <li><a href="qtmodules.html">All Qt Modules</a></li>
+ <li><a href="../qtcreator/index.html">Qt Creator Manual</a></li>
+ </ul>
+ <ul>
+ <li><a href="reference-overview.html">All Qt Reference Documentation</a></li>
+ </ul>
+ </div>
+</div>
+<div class="sectionlist normallist">
+ <div class="heading">
+ <a name="getting-started"></a>
+ <h2 id="getting-started">Getting Started</h2>
+ </div>
+ <ul>
+ <li><a href="gettingstarted.html">Getting Started with Qt</a></li>
+ <li><a href="qt5-intro.html">What's New in Qt 5</a></li>
+ <li><a href="qtexamplesandtutorials.html">Examples and Tutorials</a></li>
+ <li><a href="supported-platforms.html">Supported Platforms</a></li>
+ <li><a href="licensing.html">Qt Licensing</a></li>
+ </ul>
+</div>
+<div class="sectionlist normallist">
+ <div class="heading">
+ <a name="overviews"></a>
+ <h2 id="overviews">Overviews</h2>
+ </div>
+ <ul>
+ <li><a href="topics-app-development.html">Development Tools</a></li>
+ <li><a href="topics-ui.html">User Interfaces</a></li>
+ <li><a href="topics-core.html">Core Internals</a></li>
+ <li><a href="topics-data-storage.html">Data Storage</a></li>
+ <li><a href="qt5-intro.html#multimedia">Multimedia</a></li>
+ <li><a href="topics-network-connectivity.html">Networking and Connectivity</a></li>
+ <li><a href="topics-graphics.html">Graphics</a></li>
+ <li><a href="mobiledevelopment.html">Mobile APIs</a></li>
+ <li><a href="qmlapplications.html">QML Applications</a></li>
+ </ul>
+ <ul>
+ <li><a href="overviews-main.html">All Qt Overviews</a></li>
+ </ul>
+</div>
diff --git a/doc/src/datastorage.qdoc b/doc/src/datastorage.qdoc
index 782af70b29e82b9c0b6896d2cb5131e91094140d..e8830f3a9e69e07abe239ba56353d1b4f4e7d5f7 100644
--- a/doc/src/datastorage.qdoc
+++ b/doc/src/datastorage.qdoc
@@ -277,15 +277,14 @@ drive. Examples of archive files are ZIP, TAR, RAR and 7z.
Qt has support for archives produced by zlib (see
\l{How to compress data with Qt?}{qCompress() and qUncompress()}).
-\section1 Enginio Data Storage
-
-Enginio is a storage service for applications. New in Qt 5.3, \l{Enginio
-Manual}{Enginio} combines a \e{no-SQL} object approach with JSON and Qt APIs to
-provide applications reliable and powerful storage capabilities. The C++ and
-QML APIs interact with the \l{Enginio Data Storage} servers from Digia.
+\section1 Enginio Data Storage Backend
+Enginio is a backend for Qt Cloud services. New in Qt 5.3, the \l{Enginio
+Manual}{Enginio} mondule combines a \e{no-SQL} object approach with JSON and Qt APIs
+to provide applications a reliable and powerful storage capability. The C++ and
+QML APIs interact with the \l{Qt Cloud Services}{Qt Cloud} servers from Digia.
\list
-\li \l{Enginio Data Storage}{Enginio by Digia}
+\li \l{Qt Cloud Services} by Digia
\li \l{Enginio Manual}{Enginio} - API for developers
\endlist
diff --git a/doc/src/examples-android.qdoc b/doc/src/examples-android.qdoc
index 94aafd86bf2e903ca689406f47f10b2325fdb884..ab8782662427dbeb03ebf66a2e296cbfcf02864f 100644
--- a/doc/src/examples-android.qdoc
+++ b/doc/src/examples-android.qdoc
@@ -65,8 +65,8 @@
of Qt Quick examples including beginner-level tutorials, visit
\l{Qt Quick Examples and Tutorials}.
- \div {class="landingicons"}
- \div {class="icons1of3"}
+ \div {class="multi-column"}
+ \div {class="doc-column"}
\b{Touch and Key Interaction}
\list
\li \l{Qt Quick Examples - Touch Interaction}{Touch Interaction}
@@ -74,7 +74,7 @@
\li \l{Qt Quick Examples - MouseArea}{MouseArea}
\endlist
\enddiv
- \div {class="icons1of3"}
+ \div {class="doc-column"}
\b{Images, Animation, and Layout}
\list
\li \l{Qt Quick Examples - Image Elements}{Image Elements}
@@ -85,7 +85,7 @@
\li \l{Qt Quick Examples - Right to Left}{Right to Left}
\endlist
\enddiv
- \div {class="icons1of3"}
+ \div {class="doc-column"}
\b{Scenegraph}
\list
\li \l{Scene Graph - Custom Geometry}{Custom Geometry}
@@ -96,10 +96,7 @@
\li \l{Scene Graph - Simple Material}{Simple Material}
\endlist
\enddiv
- \enddiv
-
- \div {class="landingicons"}
- \div {class="icons1of3"}
+ \div {class="doc-column"}
\b{Particles and Effects}
\list
\li \l{Qt Quick Particles Examples - Emitters}{Emitters} (Particles)
@@ -109,7 +106,7 @@
\li \l{Qt Quick Examples - Shader Effects}{Shader Effects}
\endlist
\enddiv
- \div {class="icons1of3"}
+ \div {class="doc-column"}
\b{Extending QML}
\list
\li \l{Extending QML - Grouped Properties Example}{Grouped Properties}
@@ -118,7 +115,7 @@
\li \l{Extending QML - Attached Properties Example}{Attached Properties}
\endlist
\enddiv
- \div {class="icons1of3"}
+ \div {class="doc-column"}
\b{Multimedia}
\list
\li \l{QML Video Shader Effects Example}{Video Shader Effects Example}
diff --git a/doc/src/examples-ios.qdoc b/doc/src/examples-ios.qdoc
index cbfa0612db4c1ffbf9f52c9e1f87d40a9297e9d1..235095cc5bdefe36d1b8ee27f84043865ae247f4 100644
--- a/doc/src/examples-ios.qdoc
+++ b/doc/src/examples-ios.qdoc
@@ -63,8 +63,8 @@
of Qt Quick examples including beginner-level tutorials, visit
\l{Qt Quick Examples and Tutorials}.
- \div {class="landingicons"}
- \div {class="icons1of3"}
+ \div {class="multi-column"}
+ \div {class="doc-column"}
\b{Images, Animation, and Layout}
\list
\li \l{Qt Quick Examples - Image Elements}{Image Elements}
@@ -76,7 +76,7 @@
\li \l{Qt Quick Examples - Shader Effects}{Shader Effects}
\endlist
\enddiv
- \div {class="icons1of3"}
+ \div {class="doc-column"}
\b{Touch and Key Interaction}
\list
\li \l{Qt Quick Examples - Touch Interaction}{Touch Interaction}
diff --git a/doc/src/examples.qdoc b/doc/src/examples.qdoc
index 3399b9ea0e226330e733d98e6266b9ffba3cd48f..4b556d1a68cb2a94b41296cfcd565eaa9fc99276 100644
--- a/doc/src/examples.qdoc
+++ b/doc/src/examples.qdoc
@@ -38,7 +38,7 @@
The examples are part of the Qt packages. Visit the \l Downloads page for
more information.
- \section2 Running the Examples
+ \section1 Running the Examples
Open and run examples within Qt Creator's \gui{Welcome} mode. Most of the
examples run on various platforms and to search for platform-specific
@@ -52,17 +52,16 @@
To view a list of all Qt examples, visit the \l{List of Qt Examples} page.
- \div {class="landingicons"}
- \div {class="icons1of3"}
+ \div {class="multi-column"}
+ \div {class="doc-column"}
\b{Setting Up Projects}
\list
\li \l{Qt Creator: Creating Qt Quick Projects}{Qt Quick Projects}
\li \l{Qt Creator: Creating a Qt Widget Based Application}{Qt Widget Projects}
\li \l{Qt Creator: Configuring Projects}{Configuring Projects}
\endlist
-
\enddiv
- \div {class="icons1of3"}
+ \div {class="doc-column"}
\b{Essentials}
\list
\li \l{Qt Creator: Building for Multiple Platforms}{Building for Multiple Platforms}
@@ -74,7 +73,7 @@
\li \l{Qt Creator: Building and Running}{See more}
\endlist
\enddiv
- \div {class="icons1of3"}
+ \div {class="doc-column"}
\b{Platform Examples}
\list
\li \l{Qt for Android Examples}{Android}
@@ -84,10 +83,7 @@
\li \l{Active Qt#Examples}{Active Qt Examples}
\endlist
\enddiv
- \enddiv
-
- \div {class="landingicons"}
- \div {class="icons1of3"}
+ \div {class="doc-column"}
\b{QML and Qt Quick}
\list
\li \l{First Steps with QML}
@@ -99,7 +95,7 @@
\li \l{Qt Quick Examples and Tutorials}{See more}
\endlist
\enddiv
- \div {class="icons1of3"}
+ \div {class="doc-column"}
\b{Widgets}
\list
\li \l{Getting Started Programming with Qt Widgets}{Text Editor}
@@ -113,7 +109,7 @@
\li \l{Qt Widgets Examples}{See more}
\endlist
\enddiv
- \div {class="icons1of3"}
+ \div {class="doc-column"}
\b{Graphics}
\list
\li \l{Scene Graph - OpenGL Under QML}{OpenGL Under QML}
@@ -124,10 +120,7 @@
\li \l{Animation Framework Examples}
\endlist
\enddiv
- \enddiv
-
- \div {class="landingicons"}
- \div {class="icons1of3"}
+ \div {class="doc-column"}
\b{Data and Networking}
\list
\li \l{Network Examples}
@@ -140,7 +133,7 @@
\li \l{Qt WebKit Examples}{WebKit Examples}
\endlist
\enddiv
- \div {class="icons1of3"}
+ \div {class="doc-column"}
\b{Applications}
\list
\li \l{Application Example}
@@ -149,7 +142,7 @@
\li \l{Plug & Paint Example} (Plugin Example)
\endlist
\enddiv
- \div {class="icons1of3"}
+ \div {class="doc-column"}
\b{Processes and Threads}
\list
\li \l{Threading Basics}
@@ -158,11 +151,7 @@
\li \l{IPC Examples}{Inter-Process Communication (IPC) Examples}
\endlist
\enddiv
- \enddiv
-
-
- \div {class="landingicons"}
- \div {class="icons1of3"}
+ \div {class="doc-column"}
\b{Multimedia}
\list
\li \l{Media Player Example}{Media Player}
@@ -173,7 +162,7 @@
\li \l{Qt Multimedia Examples}{See more}
\endlist
\enddiv
- \div {class="icons1of3"}
+ \div {class="doc-column"}
\b{Peripheral Devices}
\list
\li \l{Qt Serial Port Examples}{Serial Port Examples}
@@ -183,7 +172,7 @@
\li \l{Qt Positioning Examples}{Positioning Examples}
\endlist
\enddiv
- \div {class="icons1of3"}
+ \div {class="doc-column"}
\b{Tools}
\list
\li \l{Qt Assistant Examples}
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
index 2d28fa322958d6a23a03504f0d4c7b6084cd6166..0239d8f7851dec4583f683000712787b4a5bc958 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -100,6 +100,11 @@
\title iTunes: QtQuicksand
*/
+/*!
+ \externalpage http://www.windowsphone.com/en-us/store/app/quickforecast/35572287-c6d6-4d5c-9799-46555f7fc459
+ \title Windows Store: QuickForecast
+*/
+
/*!
\externalpage https://itunes.apple.com/us/app/quick-forecast/id736658981
\title iTunes: Quick Forecast
@@ -119,6 +124,15 @@
\externalpage https://play.google.com/store/apps/details?id=com.digia.QtHangman
\title Google Play: Qt Hangman
*/
+/*!
+ \externalpage https://play.google.com/store/apps/details?id=com.digia.Flyingbus
+ \title Google Play: Flyingbus
+*/
+
+/*!
+ \externalpage https://itunes.apple.com/us/app/flyingbus/id762515926?mt=8
+ \title iTunes: Flyingbus
+*/
/*!
\externalpage http://www.gnu.org/copyleft/fdl.html
@@ -153,7 +167,7 @@
*/
/*!
\externalpage https://qtcloudservices.com/
- \title Enginio Data Storage
+ \title Qt Cloud Services
*/
/*!
\externalpage http://qt-project.org/doc/qtcreator/creator-configuring.html
diff --git a/doc/src/frameworks-technologies/accessible.qdoc b/doc/src/frameworks-technologies/accessible.qdoc
index 2a81150b86b95c15d924eb3a424fb13f2c315908..17fcb14e1142e36a60b1d574e177e7c30cfb67e6 100644
--- a/doc/src/frameworks-technologies/accessible.qdoc
+++ b/doc/src/frameworks-technologies/accessible.qdoc
@@ -27,6 +27,7 @@
/*!
\group accessibility
+ \brief Functions ensuring communication between accessible applications and accessibility tools.
\title Accessibility Classes
*/
diff --git a/doc/src/frameworks-technologies/threads.qdoc b/doc/src/frameworks-technologies/threads.qdoc
index 64b6fa0c912c3c28059a46c9ff681391fe360a5a..558ffc522e5f6c0c1c0a028366c83af733851d2b 100644
--- a/doc/src/frameworks-technologies/threads.qdoc
+++ b/doc/src/frameworks-technologies/threads.qdoc
@@ -27,6 +27,7 @@
/*!
\group thread
+ \brief How to develop multithreaded applications.
\title Threading Classes
These \l{Qt Core} classes provide threading support to applications.
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index eeb41a3c78bbe76f0ad1ef159e0b611382d5317b..a028bb7797f3f6d2f8431a94fa503ce195803e1f 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -42,31 +42,50 @@
\div {class="icons1of3"}
\image landing/icon_Qt_78x78px.png
\section1 Qt Framework
- Intuitive APIs for C++ and JavaScript-like
- programming with Qt Quick for rapid UI creation.
+ Intuitive \l{Qt Reference Pages}{API}s for \l {All Classes}{C++}
+ and JavaScript-like programming with \l{QML Applications}{Qt Quick}
+ for rapid UI creation.
\enddiv
\div {class="icons1of3"}
\image landing/icon_QtCreator_78x78px.png
\section1 Qt Creator IDE
- A powerful cross-platform integrated development
- environment, including UI designer tools and on-device
- debugging.
+ A powerful cross-platform \l{Qt Creator Manual}
+ {integrated development environment}, including
+ \l{Qt Creator: Designing User Interfaces}{UI designer}
+ tools and on-device \l{Qt Creator: Debugging}{debugging}.
\enddiv
\div {class="icons1of3"}
\image landing/icon_Tools.png
\section1 Tools and Toolchains
- Internationalization support, embedded toolchains, and more.
+ \l{Internationalization with Qt}{Internationalization} support,
+ \l{Qt for Embedded Linux}{embedded} toolchains, and more.
\enddiv
\enddiv
\section1 Licenses Used in Qt
Qt Framework and tools are available under both open-source and
- commercial licenses.
+ commercial \l{Qt Licensing}{licenses}.
The commercially licensed Qt contains additional functionality and
- productivity tools. For details, see \l{http://www.qt.io/}.
+ productivity tools. For details, see \l{http://www.qt.io/download/}.
\enddiv
- \div {class="col-2"}
+ \div {class="col-2 sidebar"}
+ \div {class="sectionlist normallist"}
+ \div {class="heading"}
+ \section1 Reference
+ \enddiv
+ \div {class="indexboxcont indexboxbar"}
+ \list
+ \li \l{All Classes}{All Qt C++ Classes}
+ \li \l{All QML Types}
+ \li \l{All Modules}{All Qt Modules}
+ \li \l{Qt Creator Manual}
+ \endlist
+ \list
+ \li \l{Qt Reference Pages}{All Qt Reference Documentation}
+ \endlist
+ \enddiv
+ \enddiv
\div {class="sectionlist normallist"}
\div {class="heading"}
\section1 Getting Started
@@ -99,22 +118,6 @@
\li \l{Qt Overviews}{All Qt Overviews}
\endlist
\enddiv
- \div {class="sectionlist normallist"}
- \div {class="heading"}
- \section1 Reference
- \enddiv
- \div {class="indexboxcont indexboxbar"}
- \list
- \li \l{All Classes}{All Qt C++ Classes}
- \li \l{All QML Types}
- \li \l{All Modules}{All Qt Modules}
- \li \l{Qt Creator Manual}
- \endlist
- \list
- \li \l{Qt Reference Pages}{All Qt Reference Documentation}
- \endlist
- \enddiv
- \enddiv
\enddiv
\enddiv
*/
diff --git a/doc/src/internationalization/i18n.qdoc b/doc/src/internationalization/i18n.qdoc
index 8e7e3364d9dcc1eef0402d1aca5ec6cb76f51901..6ab8185f7fdd32c9b58c18fbc196e4a6e048e545 100644
--- a/doc/src/internationalization/i18n.qdoc
+++ b/doc/src/internationalization/i18n.qdoc
@@ -27,6 +27,7 @@
/*!
\group i18n
+ \brief How to internationalize your Qt application.
\title Qt Classes for Internationalization
See \l{Internationalization with Qt} for information on how to use these classes
diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc
index e3bdf922573842d9eaf2134e6754cecec2c7deee..bcf22cb9182e1ec69453ab626348479553c697d1 100644
--- a/doc/src/legal/licenses.qdoc
+++ b/doc/src/legal/licenses.qdoc
@@ -30,20 +30,19 @@
\title Qt Licensing
\brief Information about licenses and licensing issues.
- Qt is available under three different licensing options designed to accommodate
+ Qt is available under different licensing options designed to accommodate
the needs of our various users.
\list
- \li Qt Commercial License
- \li GNU Lesser General Public License (LGPL) version 3
- \li GNU Lesser General Public License (LGPL) version 2.1
+ \li Enterprise, Professional, and Indie Mobile licenses.
+ \li Community license (GPL or LGPL versions 3 and 2.1).
\endlist
\note Some specific parts (modules) of the Qt framework are not available
under the GNU LGPL version 2.1. See \l {Licenses Used in Qt} for details.
- Qt licensed under our \l{Qt Commercial License}{commercial license agreement}
- is appropriate for development
+ Qt licensed under Enterprise, Professional and Indie Mobile licenses are
+ appropriate for development
of proprietary/commercial software where you do not want to share any source code
with third parties or otherwise cannot comply with the terms of the GNU LGPL
version 3 or the GNU LGPL version 2.1.
@@ -61,15 +60,19 @@
Alternatively, you may use the documentation in accordance with the terms
contained in a written agreement between you and Digia.
- Please see \l{http://qt.io/licensing/} for an overview of Qt licensing.
+ See \l{http://qt.io/licensing/} for an overview of Qt licensing, and
+ \l{http://www.qt.io/download/} for details on what is included in each license
+ type.
\section1 Purchasing and Sales Information
- To purchase or further information and assistance about Qt commercial licensing,
+ To purchase a Qt license, visit \l{http://www.qt.io/download/}.
+
+ For further information and assistance about Qt licensing,
please contact our sales via one of the following channels:
\table
- \row \li Web: \li \l{http://qt.io/contact-us/}
+ \row \li Web: \li \l{http://www.qt.io/contact-us/}
\row \li Phone, U.S. office (for sales in North America): \li \b{+1 408 433 9320}
\row \li Phone, Norway office (for sales in the rest of the world): \li \b{+47 2108 0420}
\endtable
@@ -87,7 +90,7 @@
\note Cross-module dependencies are also described on a general level. All Qt
modules depend on \l{Qt Core}.
- \table 80%
+ \table
\header \li Qt Module/Tool \li Component \li Description \li License Type \li Notes
\row \li {1,26} Qt Core
diff --git a/doc/src/platforms/android.qdoc b/doc/src/platforms/android.qdoc
index 2c52f04fbc1696c95c1d3ee25341247c6a4833ec..de85d027c5dff1f4915e830447671ad1b07d9e6a 100644
--- a/doc/src/platforms/android.qdoc
+++ b/doc/src/platforms/android.qdoc
@@ -145,7 +145,6 @@ In order to use \l{Qt for Android}, you need the following:
\li \l{http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html}{Java SE Development Kit} (JDK) v6 or later. You can also use \l{http://openjdk.java.net}{OpenJDK} on Linux.
\li On Windows, you need the following additional installations:
\list
- \li MinGW v4.8.0 revision 2
\li Android Debug Bridge (ADB) driver on the Windows platform to enable USB
debugging. The default USB driver on Windows does not allow debugging.
For details about how to get the USB driver, see
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc
index ee1de7e0bcc88d823d0475060d5dfecf1fe17db1..4fa5644c02b5fc0c7a75279e0b98aa9fef0ba75a 100644
--- a/doc/src/platforms/supported-platforms.qdoc
+++ b/doc/src/platforms/supported-platforms.qdoc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 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.
@@ -102,24 +102,32 @@
\li As provided by Ubuntu
\row \li Ubuntu Linux 12.04, X11 (64-bit)
\li As provided by Ubuntu
+ \row \li RedHat 6.5, X11 (64-bit)
+ \li As provided by Red Hat
+ \row \li openSUSE 13.1, X11 (64-bit)
+ \li As provided by SUSE
\row \li Microsoft Windows 7 (32-bit)
\li MSVC 2010 SP1
\row \li Microsoft Windows 7 (32-bit)
- \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
+ \li \l{http://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/4.9.1/threads-posix/dwarf/i686-4.9.1-release-posix-dwarf-rt_v3-rev2.7z/download}{MinGW-builds gcc 4.9.1 (32-bit)}
\row \li Microsoft Windows 8.1 (32-bit and 64-bit)
\li MSVC 2012 SP2
- \row \li Apple OS X 10.7 "Lion", Cocoa (64-bit)
- \li Clang as provided by Apple
+ \row \li Microsoft Windows 8.1 (32-bit and 64-bit)
+ \li MSVC 2013 SP3
+ \row \li Microsoft Windows Phone 8.1 (64-bit)
+ \li MSVC 2013 SP3
+ \row \li Microsoft Windows Runtime 8.1 (64-bit)
+ \li MSVC 2013 SP3
\row \li Apple OS X 10.8 "Mountain Lion", Cocoa (64-bit)
\li Clang as provided by Apple
\row \li Apple OS X 10.9 "Mavericks", Cocoa (64-bit)
\li Clang as provided by Apple
- \row \li Apple iOS 6
+ \row \li Apple OS X 10.10 "Yosemite", Cocoa (64-bit)
\li Clang as provided by Apple
- \row \li Google Android 4.2
- \li As provided by Google (Android NDK 4.8)
+ \row \li Apple iOS 8 (64-bit)
+ \li Clang as provided by Apple
+ \row \li Google Android 4.4
+ \li As provided by Google (Android NDK Revision 10c)
\endtable
These reference configurations are run on the continuous integration (CI)
@@ -145,9 +153,11 @@
\row \li Ubuntu Linux 10.04, X11 (32-bit)
\li As provided by Ubuntu
\row \li Microsoft Windows XP (32-bit)
- \li MSVC 2008
- \row \li Apple OS X 10.6 "Snow Leopard", Cocoa (32-bit)
- \li GCC as provided by Apple
+ \li MSVC 2008 SP1
+ \row \li Microsoft Windows CE 7.0
+ \li MSVC 2008 SP1
+ \row \li Apple OS X 10.7 "Lion", Cocoa (64-bit)
+ \li Clang as provided by Apple
\endtable
Digia, Qt partners, open source projects and community users
diff --git a/doc/src/platforms/windows.qdoc b/doc/src/platforms/windows.qdoc
index 2326263ab25854478786b76085856ba530036c29..f844022bff0e5084e8e44a3126bf81b7bc6749b8 100644
--- a/doc/src/platforms/windows.qdoc
+++ b/doc/src/platforms/windows.qdoc
@@ -325,8 +325,8 @@
\endlist
\li Windows SDK 7.
\li A MinGW toolchain with g++ version 4.7 or higher. Qt 5 is tested regularly with a \
- \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}
- {32 bit gcc 4.8.0 toolchain} from the \l{http://mingwbuilds.sourceforge.net}{MinGW-builds}
+ \l{http://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/4.9.1/threads-posix/dwarf/i686-4.9.1-release-posix-dwarf-rt_v3-rev2.7z/download}
+ {32 bit gcc 4.9.1 toolchain} from the \l{http://mingw-w64.sourceforge.net/}{MinGW-w64}
project.
\endlist
@@ -779,9 +779,9 @@
\table 100%
\header
\li Qt
- \li VC++ 8.0 (2005)
- \li VC++ 9.0 (2008)
\li VC++ 10.0 (2010)
+ \li VC++ 11.0 (2012)
+ \li VC++ 12.0 (2013)
\li MinGW
\row
\li \list
@@ -790,21 +790,21 @@
\li QT5WIDGETS.DLL - The QtWidgets runtime
\endlist
\li \list
- \li MSVCR80.DLL - The C runtime
- \li MSVCP80.DLL - The C++ runtime
+ \li MSVCR100.DLL - The C runtime
+ \li MSVCP100.DLL - The C++ runtime
\endlist
\li \list
- \li MSVCR90.DLL - The C runtime
- \li MSVCP90.DLL - The C++ runtime
+ \li MSVCR110.DLL - The C runtime
+ \li MSVCP110.DLL - The C++ runtime
\endlist
\li \list
- \li MSVCR100.DLL - The C runtime
- \li MSVCP100.DLL - The C++ runtime
+ \li MSVCR120.DLL - The C runtime
+ \li MSVCP120.DLL - The C++ runtime
\endlist
\li \list
- \li MINGWM10.DLL - The MinGW run-time
+ \li LIBWINPTHREAD-1.DLL
\li LIBGCC_S_DW2-1.DLL
- \li LIBSTDC++-6.dll
+ \li LIBSTDC++-6.DLL
\endlist
\endtable
diff --git a/doc/src/qmlapp/firststepsqml.qdoc b/doc/src/qmlapp/firststepsqml.qdoc
index 7403f076a1aebe6a8aa6d53f2167c59f6d143d47..587ad0b0f9c27efe189bd4d4668e0e846775bffe 100644
--- a/doc/src/qmlapp/firststepsqml.qdoc
+++ b/doc/src/qmlapp/firststepsqml.qdoc
@@ -294,7 +294,7 @@ Rectangle {
Text {
anchors.centerIn: parent
- text: animatedValue
+ text: parent.animatedValue
}
}
\endqml
diff --git a/doc/src/qt5-intro.qdoc b/doc/src/qt5-intro.qdoc
index 0774f1c1b622026d428741ef33202703fa91593c..0c0dfafbf44f6832d39a6a3eadddd206bdcd27b1 100644
--- a/doc/src/qt5-intro.qdoc
+++ b/doc/src/qt5-intro.qdoc
@@ -1,4 +1,4 @@
-/****************************************************************************
+/****************************************************************************
**
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
@@ -38,8 +38,8 @@
Developers can be more productive and flexible with the improved support
for JavaScript and QML in Qt 5, while still having the C++ foundation
- and Qt Widget support. The JavaScript backend powered by V8
- and Qt WebKit 2 will make HTML5 developers feel at home.
+ and Qt Widget support. HTML5 developers will feel at home with the Web
+ offering that includes Chromium-based Qt WebEngine and Qt WebChannel.
Qt 5 is highly compatible with Qt 4. It is possible for developers
of Qt 4 applications to seamlessly move on to Qt 5 with their current
@@ -56,21 +56,18 @@
\section1 Qt Everywhere on Mobile
- Qt 5.2 introduces the production-ready ports of Qt on Android
- and iOS. Extensive work has gone into these two platforms and these
- ports now extend Qt’s multi-platform promise to cover desktop,
+ Qt now comes with production-ready ports of for Android, iOS, and WinRT
+ (including Windows Phone 8). Extensive work has gone into these platform
+ ports, which now extend Qt’s multi-platform promise to cover desktop,
embedded, and mobile platforms with just one framework, Qt.
- With full support for Android, iOS, and Blackberry 10, Qt 5.2 is a
- great solution for targeting the mobile markets with one Qt-based
- mobile application code. It is fast and easy to bring existing
- desktop or embedded application to mobile, by simply recompiling it.
+ With full support for Android, iOS, WinRT, and Blackberry 10, Qt is a
+ great solution for targeting the mobile markets with a single codebase.
+ It is fast and easy to bring existing desktop or embedded application
+ to mobile, by simply recompiling it.
- You can install several demo applications that show Qt on iOS and
- Android from the App Store and Google Play. On Android, we have a new
- \e{Qt Everywhere} demo as well as the Qt 5 launch demo available in
- Google Play. For iOS, we have \e SubAttack and \e QtQuicksand published
- in the App Store.
+ You can install several demo applications that showcase the power of Qt
+ on these mobile platforms. Here is a small list of such applications:
Demo applications:
\list
@@ -79,10 +76,13 @@
\li \l{Google Play: Qt 5 Everywhere}{Qt 5 Everywhere}Â (Google Play)
\li \l{iTunes: SubAttack}{SubAttack} (App Store)
\li \l{iTunes: QtQuicksand}{QtQuicksand}Â (App Store)
- \li Quick Forecast on \l{iTunes: Quick Forecast}{App Store} and
- \l{Google Play: Quick Forecast}{Google Play}
+ \li Quick Forecast on \l{iTunes: Quick Forecast}{App Store},
+ \l{Google Play: Quick Forecast}{Google Play}, and
+ \l{Windows Store: QuickForeCast}{Windows Store}.
\li Qt Hangman on \l{iTunes: Qt Hangman}{App Store} and
\l{Google Play: Qt Hangman}{Google Play}
+ \li Flyingbus on \l{iTunes: Flyingbus}{App Store} and
+ \l{Google Play: Flyingbus}{Google Play}
\endlist
Platform pages:
@@ -90,6 +90,7 @@
\li \l{Qt for Android}
\li \l{Qt for BlackBerry}
\li \l{Qt for iOS}
+ \li \l{Qt for WinRT}
\endlist
\table
@@ -223,27 +224,31 @@
\li \image qtpositioning_weatherinfo_ex.jpg
\endtable
- \section1 Enginio Data Storage
+ \section1 Qt Cloud Backend
- Enginio is a storage service for applications. New in Qt 5.3,
- \l{Enginio Manual}{Enginio} combines a \e{no-SQL} object approach with JSON
- and Qt APIs to provide applications reliable and powerful storage
- capabilities. The C++ and QML APIs interact with the
- \l{Enginio Data Storage} servers from Digia.
+ Enginio is the backend for Qt Cloud Services. New in Qt 5.3, the
+ \l{Enginio Manual}{Enginio} module combines a \e{no-SQL} object
+ approach with JSON and Qt APIs to provide applications a reliable and
+ powerful storage capability. The C++ and QML APIs provided by the new
+ module interact with the Qt Cloud servers from Digia.
\list
- \li \l{Enginio Data Storage}{Enginio by Digia}
+ \li \l{Enginio Data Storage}{Qt Cloud Services} by Digia
\li \l{Enginio Manual}{Enginio} - API for developers
\endlist
- \section1 WebKit and HTML5
+ \section1 Web Engine and HTML5
- \l {Qt WebKit} is a web content rendering engine based on the open
- source WebKit project featuring broad support for standard web
- technologies. The Qt WebKit module provides integration with both
- Qt Quick and traditional widgets. The module brings the latest in
- HTML5 advancements to Qt 5, including CSS filters, animations
- and video, and Canvas and WebGL.
+ \l{Qt WebEngine} is a web content rendering engine based on Chromium
+ featuring broad support for standard web technologies. It provides
+ integration with both Qt Quick and traditional widgets. The module brings
+ the latest in HTML5 advancements to Qt 5, including CSS filters, animations
+ and video, and Canvas.
+
+ This Chromium-based Web Engnine support in Qt is complemented with
+ \l{Qt WebChannel}, which bridges the gap between QML/C++ and
+ HTML/JavaScript. It enables sharing QObjects from QML/C++ with
+ HTML/JavaScript-based clients.
\section1 Multimedia
diff --git a/doc/src/whatsnew/whatsnew53.qdoc b/doc/src/whatsnew/whatsnew53.qdoc
index 6eee9a1cb30ba850b68398317c4f0ddb92938c16..eaa5d76866c3ef6b2fd56db2faced90e45cccc88 100644
--- a/doc/src/whatsnew/whatsnew53.qdoc
+++ b/doc/src/whatsnew/whatsnew53.qdoc
@@ -1,4 +1,4 @@
-/****************************************************************************
+/****************************************************************************
**
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
@@ -41,7 +41,7 @@
\section1 New Modules
\list
- \li \l{Enginio Manual}{Enginio} - A client-side library for \l{Enginio Data Storage}.
+ \li \l{Enginio Manual}{Enginio} - A client-side library for \l{Qt Cloud Services}.
\li \l{Qt WebSockets} - An add-on module that implements the WebSocket standard
\l{http://tools.ietf.org/html/rfc6455}{RFC 6455}
\endlist