diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:35:44 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:37:48 +0100 |
| commit | b3d1613d1c2eb2f942336c27b4e760e45f18c7c5 (patch) | |
| tree | 37224c97c2b63ed668dfe97acbd64c58354c1102 | |
| parent | 29e490679e2e3610c62750eb96d9c4b81205cf96 (diff) | |
| parent | b742b8f1b654bd185244973f7bae60da951d41a4 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
Change-Id: I92077a30539d03f5052f59275567c3565588bdbc
| -rw-r--r-- | dist/changes-5.9.3 | 24 | ||||
| -rw-r--r-- | dist/changes-5.9.4 | 25 | ||||
| -rw-r--r-- | examples/canvas3d/framebuffer/qml/framebuffer/qtlogo.png | bin | 29618 -> 28210 bytes | |||
| -rw-r--r-- | examples/canvas3d/textureandlight/qml/textureandlight/qtlogo.png | bin | 29618 -> 28210 bytes | |||
| -rw-r--r-- | examples/canvas3d/threejs/oneqt/textures/devices.png | bin | 192528 -> 192439 bytes | |||
| -rw-r--r-- | examples/canvas3d/threejs/oneqt/textures/embedded.png | bin | 45874 -> 35417 bytes | |||
| -rw-r--r-- | examples/canvas3d/threejs/oneqt/textures/multiscreen.png | bin | 37659 -> 29486 bytes | |||
| -rw-r--r-- | examples/canvas3d/threejs/oneqt/textures/puzzle-pieces.png | bin | 74436 -> 65205 bytes | |||
| -rw-r--r-- | examples/canvas3d/threejs/oneqt/textures/qtlogo.png | bin | 29618 -> 28210 bytes |
9 files changed, 49 insertions, 0 deletions
diff --git a/dist/changes-5.9.3 b/dist/changes-5.9.3 new file mode 100644 index 0000000..bb5db63 --- /dev/null +++ b/dist/changes-5.9.3 @@ -0,0 +1,24 @@ +Qt 5.9.3 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.9.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +http://doc.qt.io/qt-5/index.html + +The Qt version 5.9 series is binary compatible with the 5.8.x series. +Applications compiled for 5.8 will continue to run with 5.9. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Qt 5.9.3 Changes * +**************************************************************************** + + - This release contains only minor code improvements. diff --git a/dist/changes-5.9.4 b/dist/changes-5.9.4 new file mode 100644 index 0000000..d49a42f --- /dev/null +++ b/dist/changes-5.9.4 @@ -0,0 +1,25 @@ +Qt 5.9.4 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.9.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +http://doc.qt.io/qt-5/index.html + +The Qt version 5.9 series is binary compatible with the 5.8.x series. +Applications compiled for 5.8 will continue to run with 5.9. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Qt 5.9.4 Changes * +**************************************************************************** + + - This release contains only minor code improvements. + diff --git a/examples/canvas3d/framebuffer/qml/framebuffer/qtlogo.png b/examples/canvas3d/framebuffer/qml/framebuffer/qtlogo.png Binary files differindex f7276e2..e29abe3 100644 --- a/examples/canvas3d/framebuffer/qml/framebuffer/qtlogo.png +++ b/examples/canvas3d/framebuffer/qml/framebuffer/qtlogo.png diff --git a/examples/canvas3d/textureandlight/qml/textureandlight/qtlogo.png b/examples/canvas3d/textureandlight/qml/textureandlight/qtlogo.png Binary files differindex f7276e2..e29abe3 100644 --- a/examples/canvas3d/textureandlight/qml/textureandlight/qtlogo.png +++ b/examples/canvas3d/textureandlight/qml/textureandlight/qtlogo.png diff --git a/examples/canvas3d/threejs/oneqt/textures/devices.png b/examples/canvas3d/threejs/oneqt/textures/devices.png Binary files differindex 6e537a9..2ceece6 100644 --- a/examples/canvas3d/threejs/oneqt/textures/devices.png +++ b/examples/canvas3d/threejs/oneqt/textures/devices.png diff --git a/examples/canvas3d/threejs/oneqt/textures/embedded.png b/examples/canvas3d/threejs/oneqt/textures/embedded.png Binary files differindex cd77ead..173fe62 100644 --- a/examples/canvas3d/threejs/oneqt/textures/embedded.png +++ b/examples/canvas3d/threejs/oneqt/textures/embedded.png diff --git a/examples/canvas3d/threejs/oneqt/textures/multiscreen.png b/examples/canvas3d/threejs/oneqt/textures/multiscreen.png Binary files differindex 668d65d..19a8cf5 100644 --- a/examples/canvas3d/threejs/oneqt/textures/multiscreen.png +++ b/examples/canvas3d/threejs/oneqt/textures/multiscreen.png diff --git a/examples/canvas3d/threejs/oneqt/textures/puzzle-pieces.png b/examples/canvas3d/threejs/oneqt/textures/puzzle-pieces.png Binary files differindex 9526256..ca47464 100644 --- a/examples/canvas3d/threejs/oneqt/textures/puzzle-pieces.png +++ b/examples/canvas3d/threejs/oneqt/textures/puzzle-pieces.png diff --git a/examples/canvas3d/threejs/oneqt/textures/qtlogo.png b/examples/canvas3d/threejs/oneqt/textures/qtlogo.png Binary files differindex f7276e2..e29abe3 100644 --- a/examples/canvas3d/threejs/oneqt/textures/qtlogo.png +++ b/examples/canvas3d/threejs/oneqt/textures/qtlogo.png |
