summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.qmake.conf2
-rw-r--r--doc/config/qtdoc.qdocconf2
-rw-r--r--doc/src/configure.qdoc3
-rw-r--r--doc/src/highdpi.qdoc48
-rw-r--r--doc/src/index.qdoc2
-rw-r--r--doc/src/legal/licenses.qdoc2
-rw-r--r--doc/src/platforms/emb-linux.qdoc31
-rw-r--r--doc/src/platforms/windows.qdoc50
-rw-r--r--doc/src/qt5-intro.qdoc1
-rw-r--r--doc/src/qtmodules.qdoc25
-rw-r--r--doc/src/whatsnew/whatsnew50.qdoc2
-rw-r--r--doc/src/whatsnew/whatsnew51.qdoc2
-rw-r--r--doc/src/whatsnew/whatsnew52.qdoc2
-rw-r--r--doc/src/whatsnew/whatsnew53.qdoc2
-rw-r--r--doc/src/whatsnew/whatsnew54.qdoc2
-rw-r--r--doc/src/whatsnew/whatsnew55.qdoc1
-rw-r--r--doc/src/whatsnew/whatsnew56.qdoc164
17 files changed, 307 insertions, 34 deletions
diff --git a/.qmake.conf b/.qmake.conf
index e5439818..66a0241e 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,3 +1,3 @@
load(qt_build_config)
-MODULE_VERSION = 5.5.1
+MODULE_VERSION = 5.6.0
diff --git a/doc/config/qtdoc.qdocconf b/doc/config/qtdoc.qdocconf
index 4693fb1c..5eea850e 100644
--- a/doc/config/qtdoc.qdocconf
+++ b/doc/config/qtdoc.qdocconf
@@ -43,6 +43,7 @@ depends += \
qtscript \
qtscripttools \
qtsensors \
+ qtserialbus \
qtserialport \
qtsql \
qtsvg \
@@ -52,6 +53,7 @@ depends += \
qtwebchannel \
qtwebengine \
qtwebenginewidgets \
+ qtwebenginecore \
qtwebsockets \
qtwidgets \
qtwinextras \
diff --git a/doc/src/configure.qdoc b/doc/src/configure.qdoc
index 79184d57..31f8f978 100644
--- a/doc/src/configure.qdoc
+++ b/doc/src/configure.qdoc
@@ -35,8 +35,7 @@
as determine how Qt builds and deploys applications onto host platforms.
This page discusses some of the configure options, but for
the full list of options, enter the command \c{configure -h}. Configure
- is located in \e qtbase but is also available from the main Qt source
- directory.
+ should be run from the main Qt source directory.
Unless stated otherwise, the commands in this page are for the Linux
platforms. On OS X and on Windows, the \c PATH and directory structure
diff --git a/doc/src/highdpi.qdoc b/doc/src/highdpi.qdoc
index cc9bd290..d8fb4e44 100644
--- a/doc/src/highdpi.qdoc
+++ b/doc/src/highdpi.qdoc
@@ -124,21 +124,55 @@
\li Ability to provide pixmaps or artwork for high resolution:
see \l{Drawing High Resolution Versions of Pixmaps and Images}.
- \li Qt 5.4 introduces experimental support for scaling by by device pixel ratio
- similar to OS X to the platform plugins for Windows and Unix (XCB).
- This is controlled by the environment variable \c QT_DEVICE_PIXEL_RATIO.
- It can be set to a numerical value to be used as scale factor or \c "auto"
- which causes the scale factor to be determined by checking the monitor size.
+ \li Qt 5.6 supports cross-platform high-DPI scaling for legacy applications,
+ similar to the scaling done natively by OS X. This allows applications written
+ for low-DPI screens to run unchanged on high-DPI devices. This feature is
+ opt-in, and can be enabled by the following environment variables:
+ \list
+
+ \li \c QT_AUTO_SCREEN_SCALE_FACTOR [boolean] enables automatic scaling,
+ based on the pixel density of the monitor. This will not change the size
+ of point sized fonts, since point is a physical unit of measure. Multiple
+ screens may get different scale factors.
+
+ \li \c QT_SCALE_FACTOR [numeric] defines a global scale
+ factor for the whole application, including point sized fonts.
+
+ \li \c QT_SCREEN_SCALE_FACTORS [list] specifies scale factors
+ for each screen. This will not change the size
+ of point sized fonts. This environment variable is
+ mainly useful for debugging, or to work around monitors with wrong
+ \l {https://en.wikipedia.org/wiki/Extended_Display_Identification_Data}
+ {EDID information}(Extended Display Identification Data).
+
+ The format can be either a semicolon-separated list of scale
+ factors in the same order as QGuiApplication::screens(), or a
+ semicolon-separated list of \c name=value pairs, where \c
+ name is the same as QScreen::name().
+
+ \endlist
It is recommended to use the \c Fusion style.
- \endlist
+
+ \note Non-integer scale factors may cause significant
+ scaling/painting artifacts.
+
+ \li The application attribute \c Qt::AA_NoHighDpiScaling, introduced in Qt 5.6,
+ turns off all scaling. This is intended for applications that need to use
+ actual window system coordinates, regardless of environment variables.
+
+ \li An experimental implementation of high-DPI scaling was introduced in Qt 5.4.
+ It was enabled by the environment variable \c QT_DEVICE_PIXEL_RATIO, which
+ could be set to a numerical scale factor or \c "auto". This variable is
+ deprecated in Qt 5.6.
+ \endlist
\section2 Migration of Existing Applications
In order to get an application designed for low DPI values running on a high
resolution monitors quickly, consider one of the scaling options (let the
application run as \e{DPI Unaware} on Windows or set the environment
- variable \c QT_DEVICE_PIXEL_RATIO to \c "auto". These options may incur
+ variable \c QT_AUTO_SCREEN_SCALE_FACTOR to \c "1". These options may incur
some scaling or painting artifacts, though.
In the longer term, the application should be adapted to run unmodified:
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index 6f81ddb7..1a91030c 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -32,7 +32,7 @@
\div {class="landing"}
\div {class="col-1"}
\div {class="heading"}
- \title Qt 5.5
+ \title Qt 5.6
\enddiv
Qt is a full development framework with tools designed to streamline
diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc
index 02923007..6fa98361 100644
--- a/doc/src/legal/licenses.qdoc
+++ b/doc/src/legal/licenses.qdoc
@@ -264,7 +264,7 @@
\row \li {1,4} Qt WebEngine
- \row \li \l {Qt WebEngine Widgets#License Information}{License information}
+ \row \li \l {Qt WebEngine Core#License Information}{License information}
\li \li LGPL v3 or\br LGPL v2.1 + Qt commercial license \li
\row \li \li \li \li
\row \li \li \li \li
diff --git a/doc/src/platforms/emb-linux.qdoc b/doc/src/platforms/emb-linux.qdoc
index 0dee782d..93459989 100644
--- a/doc/src/platforms/emb-linux.qdoc
+++ b/doc/src/platforms/emb-linux.qdoc
@@ -273,11 +273,23 @@
\section1 Input
When no windowing system is present, the mouse, keyboard and touch input are
- read directly via \c evdev or using helper libraries like \c tslib. Note that
- this requires that devices nodes \c {/dev/input/event*} are readable by the
- user. eglfs and linuxfb has all the evdev input handling code built-in.
+ read directly via \c evdev or using helper libraries like \c libinput or
+ \c tslib. Note that this requires that devices nodes \c {/dev/input/event*} are
+ readable by the user. eglfs and linuxfb have all the input handling code
+ compiled-in.
- \section2 Input on eglfs and linuxfb
+ \section2 Using libinput
+
+ \l{http://www.freedesktop.org/wiki/Software/libinput}{libinput} is a library
+ to handle input devices. It offers an alternative to the Qt's own evdev input
+ support. To enable using libinput, make sure the development files for libudev
+ and libinput are available when configuring and building Qt. xkbcommon is also
+ necessary if keyboard support is desired. With eglfs and linuxfb no further
+ actions are necessary as libinput will be used by default. If libinput support
+ is not available or the environment variable \c QT_QPA_EGLFS_NO_LIBINPUT is
+ set, Qt's own evdev handlers will be used as described below.
+
+ \section2 Input on eglfs and linuxfb without libinput
Parameters like the device node name can be set in the environment variables
\c QT_QPA_EVDEV_MOUSE_PARAMETERS, \c QT_QPA_EVDEV_KEYBOARD_PARAMETERS and
@@ -406,17 +418,6 @@
device discovery (based either on \e libudev or a walkthrough of
\c{/dev/input/event*}) is not functional or misbehaving.
- \section2 Using libinput
-
- \l{http://www.freedesktop.org/wiki/Software/libinput}{libinput} is a library to
- handle input devices. It offers an alternative to the default evdev input
- support. To switch to using libinput, first make sure the development files
- for libudev and libinput are available when configuring and building Qt. This
- will result in building the libinput plugin. Then, if using eglfs or linuxfb,
- disable the built-in input handlers by setting \c QT_QPA_EGLFS_DISABLE_INPUT
- or \c QT_QPA_FB_DISABLE_INPUT to \c 1. Finally, launch the application with
- \c{-plugin libinput}.
-
\section2 Debugging Input Devices
It is possible to print some information to the debug output by enabling
diff --git a/doc/src/platforms/windows.qdoc b/doc/src/platforms/windows.qdoc
index 06e189c3..c351e50b 100644
--- a/doc/src/platforms/windows.qdoc
+++ b/doc/src/platforms/windows.qdoc
@@ -291,9 +291,17 @@
The following feature keywords are relevant for choosing the OpenGL implementation:
\list
- \li \c disable_desktopgl - Disables Desktop OpenGL
- \li \c disable_angle - Disables ANGLE
- \li \c disable_d3d11 - Disables the D3D11 rasterizer in ANGLE
+ \li \c disable_desktopgl - Disables OpenGL. This ensures that Qt does not attempt
+ to use regular OpenGL (opengl32.dll), and that it starts with ANGLE right
+ away. This is useful to prevent bad OpenGL drivers from crashing the application.
+
+ \li \c disable_angle - Disables ANGLE. Ensures that Qt does not attempt to use
+ ANGLE (and so Direct3D).
+
+ \li \c disable_d3d11 - Disables the D3D11 rasterizer in ANGLE. Instead, the next
+ D3D rendering option is tried first. The default order is: D3D11, D3D9, WARP,
+ reference implementation.
+
\li \c disable_d3d9 - Disables the D3D9 rasterizer in ANGLE
\endlist
@@ -326,6 +334,42 @@
\c disable_desktopgl set, in order to prevent Qt from using their unstable
desktop OpenGL implementations and instead fall back to ANGLE right away.
+ In practice the most common combinations are expected to be the following:
+
+ \list
+ \li \c disable_desktopgl - In case the system provides OpenGL 2.0 or newer, but
+ the driver is known to be unstable and prone to crash.
+
+ \li \c disable_desktopgl, disable_angle - When no accelerated path is
+ desired. This ensures that the only option Qt tries is the sofware rasterizer
+ (opengl32sw.dll). Can be useful in virtual machines and applications that are
+ deployed on a wide range of old systems.
+
+ \li \c disable_d3d11, disable_d3d9 - When the accelerated D3D options are known to
+ be unstable and WARP is desired (when available). Can be useful in virtual machines.
+ \endlist
+
+ The supported keys for matching a given card or driver are the following. Note that
+ some of these are specific to Qt.
+
+ \list
+ \li \c os.type - Operating system: \c win, \c linux, \c macosx, \c android
+ \li \c os.version - Kernel version
+ \li \c os.release - Specifies a list of operating system releases on Windows:
+ \c xp, \c vista, \c 7, \c 8, \c 8.1, \c 10.
+
+ \li \c vendor_id - Vendor from the adapter identifier
+
+ \li \c device_id - List of PCI device IDs.
+
+ \li \c driver_version - Driver version from the adapter identifier
+
+ \li \c driver_description - Matches when the value is a substring of the driver
+ description from the adapter identifier
+
+ \li \c gl_vendor - Matches when the value is a substring of the \c GL_VENDOR string
+ \endlist
+
\section1 Building from Source
These tools are not needed to run Qt 5 applications, but they are required
diff --git a/doc/src/qt5-intro.qdoc b/doc/src/qt5-intro.qdoc
index 19d0b811..77063564 100644
--- a/doc/src/qt5-intro.qdoc
+++ b/doc/src/qt5-intro.qdoc
@@ -502,6 +502,7 @@
\section1 Related Topics
\list
+ \li \l{What's New in Qt 5.6}
\li \l{What's New in Qt 5.5}
\li \l{What's New in Qt 5.4}
\li \l{What's New in Qt 5.3}
diff --git a/doc/src/qtmodules.qdoc b/doc/src/qtmodules.qdoc
index 6572af3e..6d4aa1a8 100644
--- a/doc/src/qtmodules.qdoc
+++ b/doc/src/qtmodules.qdoc
@@ -184,6 +184,11 @@
\li
\li Plugins for additional image formats: TIFF, MNG, TGA, WBMP.
\row
+ \li \l[QtLocation]{Qt Location}
+ \li All
+ \li All
+ \li Displays map, navigation, and place content in a QML application.
+ \row
\li \l[QtMacExtras]{Qt Mac Extras}
\li All
\li \l{Qt for OS X}{OS X}
@@ -191,7 +196,7 @@
\row
\li \l[QtNfc]{Qt NFC}
\li All
- \li \l{Qt for Linux/X11}{Linux}
+ \li \l{Qt for Android}{Android} and \l{Qt for Linux/X11}{Linux}
\li Provides access to Near-Field communication (NFC) hardware.
\row
\li \l[QtOpenGL]{Qt OpenGL}
@@ -280,6 +285,11 @@
\li \l{Qt for Windows}{Windows}, \l{Qt for Linux/X11}{Linux}, and \l{Qt for OS X}{OS X}.
\li Provides a C++ API to run web applications using the \l{http://www.chromium.org/Home}{Chromium browser project}.
\row
+ \li \l[QtWebEngineCore]{Qt WebEngine Core}
+ \li All
+ \li \l{Qt for Windows}{Windows}, \l{Qt for Linux/X11}{Linux}, and \l{Qt for OS X}{OS X}.
+ \li Provides a public API shared by both \l[QtWebEngine]{Qt WebEngine} and \l[QtWebEngineWidgets]{Qt WebEngine Widgets}.
+ \row
\li \l[QtWebSockets]{Qt WebSockets}
\li All
\li All
@@ -348,15 +358,22 @@
\header
\li Module
\li Description
-
- \row \li \l{Qt Location}
- \li Displays map, navigation, and place content in a QML application.
\row \li \l{Qt WebView}
\li Displays web content in a QML application by using APIs native to the platform,
without the need to include a full web browser stack.
\row \li \l[Qt3DCore]{Qt3D Module}{Qt3D}
\li Functionality for near-realtime simulation systems with support
for 2D and 3D rendering.
+ \row \li \l[QtSerialBus]{Qt Serial Bus}
+ \li Provides access to the SocketCAN serial bus interface. However, the module is designed
+ so that it can be extended with access to any serial bus backend.
+ \row \li \l{Qt Quick Controls 2}
+ \li Provides lightweight QML types for creating performant user
+ interfaces for embedded and mobile devices. These controls achieve
+ improved efficiency by employing a simplified styling architecture
+ when compared to \l {Qt Quick Controls}, on which the module is based.
+ These types work in conjunction with \l{Qt Quick} and \l{Qt Quick
+ Layouts}.
\endtable
\section1 Qt Tools
diff --git a/doc/src/whatsnew/whatsnew50.qdoc b/doc/src/whatsnew/whatsnew50.qdoc
index b6ddb7e7..da1473c4 100644
--- a/doc/src/whatsnew/whatsnew50.qdoc
+++ b/doc/src/whatsnew/whatsnew50.qdoc
@@ -378,6 +378,8 @@
\section1 Additions to Other Qt 5 Releases
\list
+ \li \l{What's New in Qt 5.6}
+ \li \l{What's New in Qt 5.5}
\li \l{What's New in Qt 5.4}
\li \l{What's New in Qt 5.3}
\li \l{What's New in Qt 5.2}
diff --git a/doc/src/whatsnew/whatsnew51.qdoc b/doc/src/whatsnew/whatsnew51.qdoc
index 40ec74b2..76950bbf 100644
--- a/doc/src/whatsnew/whatsnew51.qdoc
+++ b/doc/src/whatsnew/whatsnew51.qdoc
@@ -228,6 +228,8 @@
\section1 Additions to Other Qt 5 Releases
\list
+ \li \l{What's New in Qt 5.6}
+ \li \l{What's New in Qt 5.5}
\li \l{What's New in Qt 5.4}
\li \l{What's New in Qt 5.3}
\li \l{What's New in Qt 5.2}
diff --git a/doc/src/whatsnew/whatsnew52.qdoc b/doc/src/whatsnew/whatsnew52.qdoc
index c7771d36..39aa9f16 100644
--- a/doc/src/whatsnew/whatsnew52.qdoc
+++ b/doc/src/whatsnew/whatsnew52.qdoc
@@ -243,6 +243,8 @@
\section1 Additions to Other Qt 5 Releases
\list
+ \li \l{What's New in Qt 5.6}
+ \li \l{What's New in Qt 5.5}
\li \l{What's New in Qt 5.4}
\li \l{What's New in Qt 5.3}
\li \l{What's New in Qt 5.1}
diff --git a/doc/src/whatsnew/whatsnew53.qdoc b/doc/src/whatsnew/whatsnew53.qdoc
index b12143b3..5b1f318d 100644
--- a/doc/src/whatsnew/whatsnew53.qdoc
+++ b/doc/src/whatsnew/whatsnew53.qdoc
@@ -244,6 +244,8 @@
\section1 Additions to Other Qt 5 Releases
\list
+ \li \l{What's New in Qt 5.6}
+ \li \l{What's New in Qt 5.5}
\li \l{What's New in Qt 5.4}
\li \l{What's New in Qt 5.2}
\li \l{What's New in Qt 5.1}
diff --git a/doc/src/whatsnew/whatsnew54.qdoc b/doc/src/whatsnew/whatsnew54.qdoc
index 958207a1..47b69a16 100644
--- a/doc/src/whatsnew/whatsnew54.qdoc
+++ b/doc/src/whatsnew/whatsnew54.qdoc
@@ -205,6 +205,8 @@
\section1 Additions to Other Qt 5 Releases
\list
+ \li \l{What's New in Qt 5.6}
+ \li \l{What's New in Qt 5.5}
\li \l{What's New in Qt 5.3}
\li \l{What's New in Qt 5.2}
\li \l{What's New in Qt 5.1}
diff --git a/doc/src/whatsnew/whatsnew55.qdoc b/doc/src/whatsnew/whatsnew55.qdoc
index 22510555..44f57dd7 100644
--- a/doc/src/whatsnew/whatsnew55.qdoc
+++ b/doc/src/whatsnew/whatsnew55.qdoc
@@ -246,6 +246,7 @@
\section1 Additions to Other Qt 5 Releases
\list
+ \li \l{What's New in Qt 5.6}
\li \l{What's New in Qt 5.4}
\li \l{What's New in Qt 5.3}
\li \l{What's New in Qt 5.2}
diff --git a/doc/src/whatsnew/whatsnew56.qdoc b/doc/src/whatsnew/whatsnew56.qdoc
new file mode 100644
index 00000000..26e7f811
--- /dev/null
+++ b/doc/src/whatsnew/whatsnew56.qdoc
@@ -0,0 +1,164 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** 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 The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/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 whatsnew56.html
+ \title What's New in Qt 5.6
+ \brief Lists the new features in Qt 5.6.
+
+ \section1 New Modules
+
+ \list
+ \li \l[Qt3DCore]{Qt3D Module}{Qt 3D}
+ \li \l[QtLocation]{Qt Location}
+ \li \l[QtSerialBus]{Qt Serial Bus}
+ \list
+ \li Included as a technology preview.
+ \li Provides a framework for accessing serial bus backends in general, and a plugin for
+ accessing the SocketCAN backend in particular.
+ \endlist
+ \li \l[QtWebEngineCore]{Qt WebEngine Core}
+ \list
+ \li Provides a public API shared by both \l [QtWebEngine]{Qt WebEngine}
+ and \l [QtWebEngineWidgets]{Qt WebEngine Widgets}.
+ \endlist
+ \endlist
+
+ \section1 New Features in Qt 5.6
+
+ \section2 Qt Bluetooth Module
+ \list
+ \li
+ \endlist
+
+ \section2 Qt Core Module
+ \list
+ \li
+ \endlist
+
+ \section2 Qt GUI Module
+ \list
+ \li
+ \endlist
+
+ \section2 Qt Multimedia Module
+ \list
+ \li
+ \endlist
+
+ \section2 Qt NFC Module
+ \list
+ \li
+ \endlist
+
+ \section2 Qt Network Module
+ \list
+ \li
+ \endlist
+
+ \section2 Qt Platform Abstraction (QPA)
+ \list
+ \li
+ \endlist
+
+ \section2 Qt QML Module
+ \list
+ \li
+ \endlist
+
+ \section2 Qt Quick Module
+ \list
+ \li
+ \endlist
+
+ \section2 Qt Quick Controls Module
+ \list
+ \li
+ \endlist
+
+ \section2 Qt WebEngine Module
+ \list
+ \li
+ \endlist
+
+ \section2 Qt WebView Module
+ \list
+ \li
+ \endlist
+
+ \section1 Deprecated Functionality
+
+ The following modules are deprecated in Qt 5.6:
+ \list
+ \li
+ \endlist
+
+ These modules are still included in Qt 5.6, but are considered for removal in future releases.
+
+ \section1 List of API Changes
+
+ The pages below contain a list of API changes in Qt 5.6:
+ \list
+ \li \l{New Classes and Functions in Qt 5.6}
+ \li \l{Obsolete Classes}
+ \endlist
+
+ \section1 Additions to Other Qt 5 Releases
+
+ \list
+ \li \l{What's New in Qt 5.5}
+ \li \l{What's New in Qt 5.4}
+ \li \l{What's New in Qt 5.3}
+ \li \l{What's New in Qt 5.2}
+ \li \l{What's New in Qt 5.1}
+ \li \l{What's New in Qt 5.0}
+ \endlist
+
+*/
+
+/*!
+ \page newclasses56.html
+ \title New Classes and Functions in Qt 5.6
+ \brief A list of new APIs in Qt 5.6.
+
+ This page contains a comprehensive list of all new classes and functions introduced in Qt 5.6.
+ Links to new APIs in previous Qt 5 releases are found at the bottom of this page.
+
+ \sincelist 5.6
+
+ \section1 Additions to Other Qt 5 Releases
+
+ \list
+ \li \l{What's New in Qt 5.5}
+ \li \l{What's New in Qt 5.4}
+ \li \l{What's New in Qt 5.3}
+ \li \l{What's New in Qt 5.2}
+ \li \l{What's New in Qt 5.1}
+ \li \l{What's New in Qt 5.0}
+ \endlist
+*/
+
View Lorry Controller Status