Skip to content
GitLab

Source

Target

Hide whitespace changes
Inline Side-by-side
Showing
with 251 additions and 199 deletions
doc/src/legal/licenses.qdoc
View file @ e08cbb3d
...@@ -30,20 +30,19 @@ ...@@ -30,20 +30,19 @@
\title Qt Licensing \title Qt Licensing
\brief Information about licenses and licensing issues. \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. the needs of our various users.
\list \list
\li Qt Commercial License \li Enterprise, Professional, and Indie Mobile licenses.
\li GNU Lesser General Public License (LGPL) version 3 \li Community license (GPL or LGPL versions 3 and 2.1).
\li GNU Lesser General Public License (LGPL) version 2.1
\endlist \endlist
\note Some specific parts (modules) of the Qt framework are not available \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. 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} Qt licensed under Enterprise, Professional and Indie Mobile licenses are
is appropriate for development appropriate for development
of proprietary/commercial software where you do not want to share any source code 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 with third parties or otherwise cannot comply with the terms of the GNU LGPL
version 3 or the GNU LGPL version 2.1. version 3 or the GNU LGPL version 2.1.
...@@ -61,15 +60,19 @@ ...@@ -61,15 +60,19 @@
Alternatively, you may use the documentation in accordance with the terms Alternatively, you may use the documentation in accordance with the terms
contained in a written agreement between you and Digia. 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 \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: please contact our sales via one of the following channels:
\table \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, 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} \row \li Phone, Norway office (for sales in the rest of the world): \li \b{+47 2108 0420}
\endtable \endtable
...@@ -87,7 +90,7 @@ ...@@ -87,7 +90,7 @@
\note Cross-module dependencies are also described on a general level. All Qt \note Cross-module dependencies are also described on a general level. All Qt
modules depend on \l{Qt Core}. modules depend on \l{Qt Core}.
\table 80% \table
\header \li Qt Module/Tool \li Component \li Description \li License Type \li Notes \header \li Qt Module/Tool \li Component \li Description \li License Type \li Notes
\row \li {1,26} Qt Core \row \li {1,26} Qt Core
...@@ -135,13 +138,14 @@ ...@@ -135,13 +138,14 @@
\li implements the MD4 message-digest algorithm. \li BSD \li \li implements the MD4 message-digest algorithm. \li BSD \li
\row \li \l{MD5 (md5.cpp and md5.h)}{MD5} \row \li \l{MD5 (md5.cpp and md5.h)}{MD5}
\li implements the MD5 message-digest algorithm. \li BSD \li \li implements the MD5 message-digest algorithm. \li BSD \li
\row \li \l {Mesa 3D Graphics Library}{Mesa llvmpipe}
\li Mesa llvmpipe software rasterizer backend (\c opengl32sw.dll) for Windows builds. \li MIT \li \l {Qt for Windows}
\row \li \l{SHA-1 (sha1.cpp)}{SHA-1} \row \li \l{SHA-1 (sha1.cpp)}{SHA-1}
\li implements the SHA-1 encryption algorithm. \li BSD \li \li implements the SHA-1 encryption algorithm. \li BSD \li
\row \li \l{SHA-3, originally known as Keccak}{SHA-3} \row \li \l{SHA-3, originally known as Keccak}{SHA-3}
\li implements the SHA-3 encryption algorithm. \li BSD \li \li implements the SHA-3 encryption algorithm. \li BSD \li
\row \li \l{Data Compression Library (zlib) version 1.2.5}{zlib} \row \li \l{Data Compression Library (zlib) version 1.2.5}{zlib}
\li zlib is a general purpose data compression library. \li BSD-style \li \li zlib is a general purpose data compression library. \li BSD-style \li
\row \li \li \li \li
\row \li {1,12} Qt Gui \row \li {1,12} Qt Gui
\row \li \l{QKeyMapper class on X11 platforms}{QKeyMapper} \row \li \l{QKeyMapper class on X11 platforms}{QKeyMapper}
...@@ -281,16 +285,20 @@ ...@@ -281,16 +285,20 @@
\row \li {1,6} Qt Image Formats \row \li {1,6} Qt Image Formats
\row \li {4,1} \b{Third-party Licenses} \row \li {4,1} \b{Third-party Licenses}
\row \li \l{JasPer (libjasper) version 2.0}{JasPer}
\li A collection of software for the coding and manipulation of images. \li BSD-style \li
\row \li \l{TIFF Software Distribution (libtiff) version 3.9.2}{TIFF} \row \li \l{TIFF Software Distribution (libtiff) version 3.9.2}{TIFF}
\li libtiff is a set of C functions (a library) that support the manipulation of TIFF image files. \li BSD \li \li libtiff is a set of C functions (a library) that support the manipulation of TIFF image files. \li BSD \li
\row \li \l{MNG Library (libmng) version 1.0.10}{MNG} \row \li \l{MNG Library (libmng) version 1.0.10}{MNG}
\li Support decoding and displaying of MNG format image files. \li BSD-style \li \li Support decoding and displaying of MNG format image files. \li BSD-style \li
\row \li \l{WebP (libwebp) version 0.4.0}{WebP}
\li Support decoding and displaying of WebP format image files. \li BSD-style \li
\row \li \li \li \li \row \li \li \li \li
\row \li \li \li \li \row \li \li \li \li
\row \li {1,4} Qt SQL \row \li {1,4} Qt SQL
\row \li \l{SQLite (sqlite) version 3.7.17.0}{SQLite} \row \li \l{SQLite (sqlite) version 3.8.5.0}{SQLite}
\li A C library that implements a self-contained, embeddable, zero-configuration SQL database engine. \li BSD-style \li \li A C library that implements a self-contained, embeddable, zero-configuration SQL database engine. \li BSD-style \li
\row \li \li \li \li \row \li \li \li \li
\row \li \li \li \li \row \li \li \li \li
...@@ -355,10 +363,6 @@ ...@@ -355,10 +363,6 @@
See also: \l{Licenses for Fonts Used in Qt for Embedded Linux} See also: \l{Licenses for Fonts Used in Qt for Embedded Linux}
\hr
\generatelist legalese
\section1 Native Style for Android \section1 Native Style for Android
\legalese \legalese
...@@ -635,7 +639,7 @@ ...@@ -635,7 +639,7 @@
\section1 ANGLE \section1 ANGLE
Copyright (C) 2002-2010 The ANGLE Project Authors. Copyright (C) 2002-2013 The ANGLE Project Authors.
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
...@@ -669,56 +673,9 @@ ...@@ -669,56 +673,9 @@
POSSIBILITY OF SUCH DAMAGE. POSSIBILITY OF SUCH DAMAGE.
\list \list
\li ANGLE library in qtbase/src/testlib/3rdparty/angle \li ANGLE library in qtbase/src/3rdparty/angle
\endlist \endlist
\hr
Copyright (c) 2002, NVIDIA Corporation.
NVIDIA Corporation("NVIDIA") supplies this software to you in
consideration of your agreement to the following terms, and your use,
installation, modification or redistribution of this NVIDIA software
constitutes acceptance of these terms. If you do not agree with these
terms, please do not use, install, modify or redistribute this NVIDIA
software.
In consideration of your agreement to abide by the following terms, and
subject to these terms, NVIDIA grants you a personal, non-exclusive
license, under NVIDIA's copyrights in this original NVIDIA software (the
"NVIDIA Software"), to use, reproduce, modify and redistribute the
NVIDIA Software, with or without modifications, in source and/or binary
forms; provided that if you redistribute the NVIDIA Software, you must
retain the copyright notice of NVIDIA, this notice and the following
text and disclaimers in all such redistributions of the NVIDIA Software.
Neither the name, trademarks, service marks nor logos of NVIDIA
Corporation may be used to endorse or promote products derived from the
NVIDIA Software without specific prior written permission from NVIDIA.
Except as expressly stated in this notice, no other rights or licenses
express or implied, are granted by NVIDIA herein, including but not
limited to any patent rights that may be infringed by your derivative
works or by other works in which the NVIDIA Software may be
incorporated. No hardware is licensed hereunder.
THE NVIDIA SOFTWARE IS BEING PROVIDED ON AN "AS IS" BASIS, WITHOUT
WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED,
INCLUDING WITHOUT LIMITATION, WARRANTIES OR CONDITIONS OF TITLE,
NON-INFRINGEMENT, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
ITS USE AND OPERATION EITHER ALONE OR IN COMBINATION WITH OTHER
PRODUCTS.
IN NO EVENT SHALL NVIDIA BE LIABLE FOR ANY SPECIAL, INDIRECT,
INCIDENTAL, EXEMPLARY, CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
TO, LOST PROFITS; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) OR ARISING IN ANY WAY
OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE
NVIDIA SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT,
TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF
NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\list
\li ANGLE preprosessor in qtbase/src/testlib/3rdparty/angle/src/compiler/preprocessor
\endlist
\section1 WebKit used by the QtWebKit module \section1 WebKit used by the QtWebKit module
......
doc/src/platforms/android.qdoc
View file @ e08cbb3d
...@@ -145,7 +145,6 @@ In order to use \l{Qt for Android}, you need the following: ...@@ -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 \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: \li On Windows, you need the following additional installations:
\list \list
\li MinGW v4.8.0 revision 2
\li Android Debug Bridge (ADB) driver on the Windows platform to enable USB \li Android Debug Bridge (ADB) driver on the Windows platform to enable USB
debugging. The default USB driver on Windows does not allow debugging. debugging. The default USB driver on Windows does not allow debugging.
For details about how to get the USB driver, see For details about how to get the USB driver, see
......
doc/src/platforms/supported-platforms.qdoc
View file @ e08cbb3d
/**************************************************************************** /****************************************************************************
** **
** 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 ** Contact: http://www.qt-project.org/legal
** **
** This file is part of the documentation of the Qt Toolkit. ** This file is part of the documentation of the Qt Toolkit.
...@@ -102,24 +102,32 @@ ...@@ -102,24 +102,32 @@
\li As provided by Ubuntu \li As provided by Ubuntu
\row \li Ubuntu Linux 12.04, X11 (64-bit) \row \li Ubuntu Linux 12.04, X11 (64-bit)
\li As provided by Ubuntu \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) \row \li Microsoft Windows 7 (32-bit)
\li MSVC 2010 SP1 \li MSVC 2010 SP1
\row \li Microsoft Windows 7 (32-bit) \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)} \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 (32-bit and 64-bit)
\li MSVC 2012 SP2
\row \li Microsoft Windows 8.1 (32-bit and 64-bit) \row \li Microsoft Windows 8.1 (32-bit and 64-bit)
\li MSVC 2012 SP2 \li MSVC 2012 SP2
\row \li Apple OS X 10.7 "Lion", Cocoa (64-bit) \row \li Microsoft Windows 8.1 (32-bit and 64-bit)
\li Clang as provided by Apple \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) \row \li Apple OS X 10.8 "Mountain Lion", Cocoa (64-bit)
\li Clang as provided by Apple \li Clang as provided by Apple
\row \li Apple OS X 10.9 "Mavericks", Cocoa (64-bit) \row \li Apple OS X 10.9 "Mavericks", Cocoa (64-bit)
\li Clang as provided by Apple \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 \li Clang as provided by Apple
\row \li Google Android 4.2 \row \li Apple iOS 8 (64-bit)
\li As provided by Google (Android NDK 4.8) \li Clang as provided by Apple
\row \li Google Android 4.4
\li As provided by Google (Android NDK Revision 10c)
\endtable \endtable
These reference configurations are run on the continuous integration (CI) These reference configurations are run on the continuous integration (CI)
...@@ -145,9 +153,11 @@ ...@@ -145,9 +153,11 @@
\row \li Ubuntu Linux 10.04, X11 (32-bit) \row \li Ubuntu Linux 10.04, X11 (32-bit)
\li As provided by Ubuntu \li As provided by Ubuntu
\row \li Microsoft Windows XP (32-bit) \row \li Microsoft Windows XP (32-bit)
\li MSVC 2008 \li MSVC 2008 SP1
\row \li Apple OS X 10.6 "Snow Leopard", Cocoa (32-bit) \row \li Microsoft Windows CE 7.0
\li GCC as provided by Apple \li MSVC 2008 SP1
\row \li Apple OS X 10.7 "Lion", Cocoa (64-bit)
\li Clang as provided by Apple
\endtable \endtable
Digia, Qt partners, open source projects and community users Digia, Qt partners, open source projects and community users
......
doc/src/platforms/windows.qdoc
View file @ e08cbb3d
...@@ -325,8 +325,8 @@ ...@@ -325,8 +325,8 @@
\endlist \endlist
\li Windows SDK 7. \li Windows SDK 7.
\li A MinGW toolchain with g++ version 4.7 or higher. Qt 5 is tested regularly with a \ \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} \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.8.0 toolchain} from the \l{http://mingwbuilds.sourceforge.net}{MinGW-builds} {32 bit gcc 4.9.1 toolchain} from the \l{http://mingw-w64.sourceforge.net/}{MinGW-w64}
project. project.
\endlist \endlist
...@@ -779,9 +779,9 @@ ...@@ -779,9 +779,9 @@
\table 100% \table 100%
\header \header
\li Qt \li Qt
\li VC++ 8.0 (2005)
\li VC++ 9.0 (2008)
\li VC++ 10.0 (2010) \li VC++ 10.0 (2010)
\li VC++ 11.0 (2012)
\li VC++ 12.0 (2013)
\li MinGW \li MinGW
\row \row
\li \list \li \list
...@@ -790,21 +790,21 @@ ...@@ -790,21 +790,21 @@
\li QT5WIDGETS.DLL - The QtWidgets runtime \li QT5WIDGETS.DLL - The QtWidgets runtime
\endlist \endlist
\li \list \li \list
\li MSVCR80.DLL - The C runtime \li MSVCR100.DLL - The C runtime
\li MSVCP80.DLL - The C++ runtime \li MSVCP100.DLL - The C++ runtime
\endlist \endlist
\li \list \li \list
\li MSVCR90.DLL - The C runtime \li MSVCR110.DLL - The C runtime
\li MSVCP90.DLL - The C++ runtime \li MSVCP110.DLL - The C++ runtime
\endlist \endlist
\li \list \li \list
\li MSVCR100.DLL - The C runtime \li MSVCR120.DLL - The C runtime
\li MSVCP100.DLL - The C++ runtime \li MSVCP120.DLL - The C++ runtime
\endlist \endlist
\li \list \li \list
\li MINGWM10.DLL - The MinGW run-time \li LIBWINPTHREAD-1.DLL
\li LIBGCC_S_DW2-1.DLL \li LIBGCC_S_DW2-1.DLL
\li LIBSTDC++-6.dll \li LIBSTDC++-6.DLL
\endlist \endlist
\endtable \endtable
......
doc/src/qmlapp/firststepsqml.qdoc
View file @ e08cbb3d
...@@ -294,7 +294,7 @@ Rectangle { ...@@ -294,7 +294,7 @@ Rectangle {
Text { Text {
anchors.centerIn: parent anchors.centerIn: parent
text: animatedValue text: parent.animatedValue
} }
} }
\endqml \endqml
......
doc/src/qt5-intro.qdoc
View file @ e08cbb3d
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal ** Contact: http://www.qt-project.org/legal
...@@ -38,8 +38,8 @@ ...@@ -38,8 +38,8 @@
Developers can be more productive and flexible with the improved support Developers can be more productive and flexible with the improved support
for JavaScript and QML in Qt 5, while still having the C++ foundation 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 Widget support. HTML5 developers will feel at home with the Web
and Qt WebKit 2 will make HTML5 developers feel at home. offering that includes Chromium-based Qt WebEngine and Qt WebChannel.
Qt 5 is highly compatible with Qt 4. It is possible for developers 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 of Qt 4 applications to seamlessly move on to Qt 5 with their current
...@@ -56,22 +56,30 @@ ...@@ -56,22 +56,30 @@
\section1 Qt Everywhere on Mobile \section1 Qt Everywhere on Mobile
Qt 5.2 introduces the production-ready ports of Qt on Android \raw HTML
and iOS. Extensive work has gone into these two platforms and these <div class="table">
ports now extend Qt’s multi-platform promise to cover desktop, <table style="background:transparent; border: none">
embedded, and mobile platforms with just one framework, Qt. <tr><td style="width:50%; border: none; vertical-align: top">
\endraw
With full support for Android, iOS, and Blackberry 10, Qt 5.2 is a Qt now comes with production-ready ports for Android, iOS, and WinRT
great solution for targeting the mobile markets with one Qt-based (including Windows Phone 8). Extensive work has gone into these platform
mobile application code. It is fast and easy to bring existing ports, which now extend Qt’s multi-platform promise to cover desktop,
desktop or embedded application to mobile, by simply recompiling it. embedded, and mobile platforms.
\raw HTML
You can install several demo applications that show Qt on iOS and <br>
Android from the App Store and Google Play. On Android, we have a new \endraw
\e{Qt Everywhere} demo as well as the Qt 5 launch demo available in With full support for Android, iOS, WinRT, and Blackberry 10, Qt is a
Google Play. For iOS, we have \e SubAttack and \e QtQuicksand published great solution for targeting the mobile markets with a single codebase.
in the App Store. It is fast and easy to bring existing desktop or embedded application
to mobile, by simply recompiling it.
\raw HTML
<br>
\endraw
You can install several demo applications that showcase the power of Qt
on these mobile platforms. Here is a small list of such applications:
\raw HTML
<br>
\endraw
Demo applications: Demo applications:
\list \list
\li \l{Google Play: Introduction to Qt 5}{Introduction to Qt 5} \li \l{Google Play: Introduction to Qt 5}{Introduction to Qt 5}
...@@ -79,10 +87,13 @@ ...@@ -79,10 +87,13 @@
\li \l{Google Play: Qt 5 Everywhere}{Qt 5 Everywhere} (Google Play) \li \l{Google Play: Qt 5 Everywhere}{Qt 5 Everywhere} (Google Play)
\li \l{iTunes: SubAttack}{SubAttack} (App Store) \li \l{iTunes: SubAttack}{SubAttack} (App Store)
\li \l{iTunes: QtQuicksand}{QtQuicksand} (App Store) \li \l{iTunes: QtQuicksand}{QtQuicksand} (App Store)
\li Quick Forecast on \l{iTunes: Quick Forecast}{App Store} and \li Quick Forecast on \l{iTunes: Quick Forecast}{App Store},
\l{Google Play: Quick Forecast}{Google Play} \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 \li Qt Hangman on \l{iTunes: Qt Hangman}{App Store} and
\l{Google Play: Qt Hangman}{Google Play} \l{Google Play: Qt Hangman}{Google Play}
\li Flyingbus on \l{iTunes: Flyingbus}{App Store} and
\l{Google Play: Flyingbus}{Google Play}
\endlist \endlist
Platform pages: Platform pages:
...@@ -90,30 +101,39 @@ ...@@ -90,30 +101,39 @@
\li \l{Qt for Android} \li \l{Qt for Android}
\li \l{Qt for BlackBerry} \li \l{Qt for BlackBerry}
\li \l{Qt for iOS} \li \l{Qt for iOS}
\li \l{Qt for WinRT}
\endlist \endlist
\raw HTML
\table </td><td style="width:50%; vertical-align:top;border: none;">
\header \endraw
\li Qt Everywhere demo on Nexus 7 \image qt5_everywhere_demo.jpg
\row \caption Qt Everywhere demo on Nexus 7
\li \image qt5_everywhere_demo.jpg \raw HTML
\endtable </td></tr>
</table>
</div>
\endraw
\section1 Amazing Graphics Capability and Performance \section1 Amazing Graphics Capability and Performance
\raw HTML
<div class="table">
<table style="background:transparent; border: none">
<tr><td style="width:50%; vertical-align:top;border: none;">
\endraw
\image qt5_shadereffect.jpg
\caption ShaderEffect on an \l Image
\raw HTML
</td><td style="width:50%; border: none; vertical-align: top">
\endraw
Qt 5 uses an OpenGL-based scene graph to accelerate the graphics Qt 5 uses an OpenGL-based scene graph to accelerate the graphics
of Qt Quick, making it possible to do visually appealing user of Qt Quick, making it possible to do visually appealing user
interfaces with animations, impressive graphical effects and interfaces with animations, impressive graphical effects and
particle systems, even on the constrained hardware environments of particle systems, even on the constrained hardware environments of
mobile and embedded devices. mobile and embedded devices.
\raw HTML
\table <br>
\header \endraw
\li ShaderEffect on an \l Image
\row
\li \image qt5_shadereffect.jpg
\endtable
The benefits of this architectural change in the rendering engine are The benefits of this architectural change in the rendering engine are
well demonstrated by the following projects: well demonstrated by the following projects:
\list \list
...@@ -125,9 +145,19 @@ ...@@ -125,9 +145,19 @@
\li \l{QtonPi} - Good example of Qt 5 running on the low cost hardware, \li \l{QtonPi} - Good example of Qt 5 running on the low cost hardware,
Raspberry PI. Raspberry PI.
\endlist \endlist
\raw HTML
</td></tr>
</table>
</div>
\endraw
\section1 Qt Quick in Qt 5 \section1 Qt Quick in Qt 5
\raw HTML
<div class="table">
<table style="background:transparent; border: none;">
<tr><td style="width:50%; border-bottom:0px;">
\endraw
\l{Qt Quick} provides the necessary infrastructure to develop QML \l{Qt Quick} provides the necessary infrastructure to develop QML
applications. The latest version (v2.0) of this technology also applications. The latest version (v2.0) of this technology also
introduces a set of new C++ classes as a replacement for the introduces a set of new C++ classes as a replacement for the
...@@ -158,54 +188,66 @@ ...@@ -158,54 +188,66 @@
\li \l{Qt Quick Scene Graph}{OpenGL-based rendering architecture} for \li \l{Qt Quick Scene Graph}{OpenGL-based rendering architecture} for
optimal performance. optimal performance.
\endlist \endlist
\raw HTML
\table </td><td style="width:50%; vertical-align:top;border: none;">
\header \endraw
\li Qt Quick's \l{Qt Quick Particles QML Types}{Particle System} \image qt5_particles.jpg
\row \caption Qt Quick's \l{Qt Quick Particles QML Types}{Particle System}
\li \image qt5_particles.jpg \raw HTML
\endtable </td></tr><tr><td style="width:50%; vertical-align:top;border: none;">
\endraw
Qt Quick's \l {Using the Qt Quick Particle System}{Particle System}
The \l {qtgraphicaleffects-index.html}{Qt Graphical Effects} module The \l {qtgraphicaleffects-index.html}{Qt Graphical Effects} module
provides a number of ready-made effects for use in Qt Quick provides a number of ready-made effects for use in Qt Quick
applications, including soft drop shadow, blur, glow and colorize. applications, including soft drop shadow, blur, glow and colorize.
\raw HTML
\table </td><td style="width:50%; vertical-align:top;border: none;">
\header \endraw
\li Excerpts from the Qt Graphical Effects module \image qt5_graphicaleffects.jpg
\row \caption Excerpts from the Qt Graphical Effects module
\li \image qt5_graphicaleffects.jpg \raw HTML
\endtable </td></tr>
</table>
</div>
\endraw
\section1 Designing UI Made Simpler \section1 Designing UI Made Simpler
\raw HTML
<div class="table">
<table style="background:transparent; border: none">
<tr><td style="width:25%; border: none; vertical-align: top">
\endraw
\image qtquickcontrols-example-gallery-android.png
\caption Controls gallery example on Android
\raw HTML
</td><td style="width:30%; border: none; vertical-align: top">
\endraw
\image qtquickcontrols-example-gallery-osx.png
\caption Controls gallery example on OS X
\raw HTML
</td><td style="width:45%; border: none; vertical-align: top">
\endraw
UI designing can be time consuming if there are not enough tools to help. UI designing can be time consuming if there are not enough tools to help.
Qt Quick does reduce the effort considerably compared to the traditional Qt Quick does reduce the effort considerably compared to the traditional
native (C or C++) approach, but the new \l{Qt Quick Controls} and native (C or C++) approach, but the new \l{Qt Quick Controls} and
\l{Qt Quick Layouts} take it a step further. These new modules provide \l{Qt Quick Layouts} take it a step further. These new modules provide
ready-to-use UI controls and layouts to enable faster application ready-to-use UI controls and layouts to enable faster application
development and with less code. development and with less code.
\raw HTML
<br>
\endraw
Qt Quick Controls and Qt Quick Layouts provide a vast set of UI controls Qt Quick Controls and Qt Quick Layouts provide a vast set of UI controls
ranging from the most basic TextField and Button to the more complex ranging from the most basic TextField and Button to the more complex
TableView and TabView. These controls are also made available in TableView and TabView. These controls are also made available in
\l{Qt Creator: Using Qt Quick Designer}{Qt Quick Designer}. \l{Qt Creator: Using Qt Quick Designer}{Qt Quick Designer}.
\raw HTML
\table </td></tr>
\header </table>
\li Controls touch example on Nexus 7 </div>
\row \endraw
\li \image quick_controls_touch_ex.jpg
\endtable
\table
\header
\li Component gallery example on Ubuntu 12.04
\row
\li \image qtquickcontrols-example-gallery.jpg
\endtable
\section1 Sensor and Location \section1 Sensor and Location
...@@ -214,51 +256,89 @@ ...@@ -214,51 +256,89 @@
can support such use cases in your Qt application using the can support such use cases in your Qt application using the
\l{Qt Sensors} and \l{Qt Positioning} modules. \l{Qt Sensors} and \l{Qt Positioning} modules.
\table \raw HTML
\header <div class="table">
\li Accelerating SVG image <table style="background:transparent; border: none">
\li Location-based weather information <tr><td style="width:50%; vertical-align:top;border: none;">
\row \endraw
\li \image qtsensors_accelbubble_ex.jpg \image qtsensors_accelbubble_ex.jpg
\li \image qtpositioning_weatherinfo_ex.jpg \caption Accelerating SVG image
\endtable \raw HTML
</td><td style="width:50%; vertical-align:top;border: none;">
\section1 Enginio Data Storage \endraw
\image qtpositioning_weatherinfo_ex.jpg
Enginio is a storage service for applications. New in Qt 5.3, \caption Location-based weather information
\l{Enginio Manual}{Enginio} combines a \e{no-SQL} object approach with JSON \raw HTML
and Qt APIs to provide applications reliable and powerful storage </td></tr>
capabilities. The C++ and QML APIs interact with the </table>
\l{Enginio Data Storage} servers from Digia. </div>
\endraw
\section1 Qt Cloud Backend
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 \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 \li \l{Enginio Manual}{Enginio} - API for developers
\endlist \endlist
\section1 WebKit and HTML5 \section1 Web Engine and HTML5
\l {Qt WebKit} is a web content rendering engine based on the open \raw HTML
source WebKit project featuring broad support for standard web <div class="table">
technologies. The Qt WebKit module provides integration with both <table style="background:transparent; border: none">
Qt Quick and traditional widgets. The module brings the latest in <tr><td colspan=2 style="width:50%; border: none; vertical-align: top">
HTML5 advancements to Qt 5, including CSS filters, animations \endraw
and video, and Canvas and WebGL. \image qtwebengine_quicknanobrowser.jpg
\caption Qt Quick nano browser
\raw HTML
</td><td style="width:50%; border: none; vertical-align: top">
\endraw
\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.
\raw HTML
<br>
\endraw
This Chromium-based Web Engine 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.
\raw HTML
</td></tr>
</table>
</div>
\endraw
\section1 Multimedia \section1 Multimedia
\raw HTML
<div class="table">
<table style="background:transparent; border: none">
<tr><td colspan=2 style="width:50%; border: none; vertical-align: top">
\endraw
\l {Qt Multimedia} provides a rich set of QML types and C++ classes to \l {Qt Multimedia} provides a rich set of QML types and C++ classes to
handle multimedia content. It also provides necessary APIs to access handle multimedia content. It also provides necessary APIs to access
the camera and radio functionality. Qt 5 brings the Qt Multimedia the camera and radio functionality. Qt 5 brings the Qt Multimedia
module into the set of essential modules with support on all major module into the set of essential modules with support on all major
platforms. platforms.
\raw HTML
\table </td><td style="width:50%; border: none;">
\header \endraw
\li Video embedded into a Qt Quick application with a displacement effect \image qt5_video.jpg
\row \caption Video embedded into a Qt Quick application with a displacement effect
\li \image qt5_video.jpg \raw HTML
\endtable </td></tr>
</table>
</div>
\endraw
\section1 Platform-specific Extras \section1 Platform-specific Extras
...@@ -298,12 +378,18 @@ ...@@ -298,12 +378,18 @@
The \l {Qt Widgets} have been separated into their own module in The \l {Qt Widgets} have been separated into their own module in
Qt 5, the Qt Widgets module. It is part of the essential modules. Qt 5, the Qt Widgets module. It is part of the essential modules.
\table \raw HTML
\header <div class="table">
\li Screen capture of a widget application. <table style="background:transparent; border: none">
\row <tr><td colspan=2 style="width:50%; border: none; vertical-align: top">
\li \image qt5_widgets.jpg \endraw
\endtable \image qt5_widgets.jpg
\caption Screen capture of a widget application.
\raw HTML
</td></tr>
</table>
</div>
\endraw
Designing the UI for widget-based applications can be quick with Designing the UI for widget-based applications can be quick with
\l{Qt Designer Manual}{Qt Designer}. \l{Qt Designer Manual}{Qt Designer}.
......
doc/src/whatsnew/whatsnew53.qdoc
View file @ e08cbb3d
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal ** Contact: http://www.qt-project.org/legal
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
\section1 New Modules \section1 New Modules
\list \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 \li \l{Qt WebSockets} - An add-on module that implements the WebSocket standard
\l{http://tools.ietf.org/html/rfc6455}{RFC 6455} \l{http://tools.ietf.org/html/rfc6455}{RFC 6455}
\endlist \endlist
......