diff options
| -rw-r--r-- | dist/changes-5.6.2 | 80 | ||||
| -rw-r--r-- | src/qml/qml.pro | 4 | ||||
| -rw-r--r-- | src/quick/scenegraph/util/qsgdefaultpainternode.cpp | 4 |
3 files changed, 86 insertions, 2 deletions
diff --git a/dist/changes-5.6.2 b/dist/changes-5.6.2 new file mode 100644 index 0000000000..57bae85ae4 --- /dev/null +++ b/dist/changes-5.6.2 @@ -0,0 +1,80 @@ +Qt 5.6.2 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.6.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.6 series is binary compatible with the 5.5.x series. +Applications compiled for 5.5 will continue to run with 5.6. + +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. + +QtQml +----- + + - [QTBUG-53412] Fix mapping of null JS values to null SQL values instead + of empty strings. + - [QTBUG-53794] Fix crash when using the "with" statement with an + expression that throws an exception. + - [QTBUG-54589] Fix assertion when deleting properties of JS objects + - Fix crash when incubating objects asynchronously with initial properties. + - Fix support for QJSValue parameters in QML signal handlers. + - Fix crash on 64-bit big endian architectures. + - Fix literal string assignments to QVector2D and QQuaternion properties. + - Fix crashes when using Component.onDestruction handlers. + - [QTBUG-49232] Fix assignment of values to quint8 properties. + - [QTBUG-48136] Fix QQmlPropertyMap emitting valueChanged when the value had + not actually changed, causing side effects such as causing fake binding loops. + - [QTBUG-55238] Work around miscompilations with Visual Studio 2015 Update 3 + - [QTBUG-55482] Work around a crash in release mode with GCC 6 related to dead + store elimination + +QtQuick +------- + + - Fix QtQuick scenegraph waiting up to a full vsync duration before rendering + the first frame. + - ShaderEffect: Fix a crash when a ShaderEffect and an Image both share the + same texture via supportsAtlasTextures. + - [QTBUG-53726] Flickable: Fix widthRatio and heightRatio being incorrect when + the content is smaller than the view. + - [QTBUG-42928] MultiPointTouchArea: Fix touch points remaining pressed when + the MultiPointTouchArea is hidden or disabled. + - [QTBUG-53937] AnimatedSprite: Fix a potential infinite loop when changing + image source. + - [QTBUG-53263] ListView: Fix items not always rendering when inserting many + items into a model. + - [QTBUG-52901] Fixed QQuickPaintedItem not scaling correctly for high DPI when + using a renderTarget of FramebufferObject + - [QTBUG-52534] MouseArea: Fix drag.threshold when preventStealing is in use. + - QQuickWidget now properly repaints text on high-DPI screen changes. + - [QTBUG-54238] qt.scenegraph.info logging category got renamed to + qt.scenegraph.general. + + - QQuickItem: + * [QTBUG-31861] Fixed issue with mouse button events being sent even + when they were disabled by setAcceptedMouseButtons. + * [QTBUG-40145] Fix multiple items gaining activeFocus incorrectly. + + - Text: + * [QTBUG-54075] Fix positioning of inline images when using StyledText. + * [QTBUG-52389] Fixed clipping of glyphs that extend beyond font's em + square. + * Fix mouse presses being eaten when textFormat was PlainText. In this + case, the item cannot possibly make use of a press (as there are no + hyperlinks), but deprives other items of the opportunity to take the press. + + - PathView: + * [QTBUG-53464] PathView: Fix items not being correctly created in some + circumstances. + * [QTBUG-37815] PathView: Fix infinite loop when creating items in some + circumstances. + diff --git a/src/qml/qml.pro b/src/qml/qml.pro index 651afa6b75..7c9eef6df1 100644 --- a/src/qml/qml.pro +++ b/src/qml/qml.pro @@ -21,6 +21,10 @@ greaterThan(QT_GCC_MAJOR_VERSION, 5) { QMAKE_CXXFLAGS += -fno-delete-null-pointer-checks -fno-lifetime-dse } +# QTBUG-55238, disable new optimizer for MSVC 2015/Update 3. +release:win32-msvc*:equals(QT_CL_MAJOR_VERSION, 19):equals(QT_CL_MINOR_VERSION, 00): \ + greaterThan(QT_CL_PATCH_VERSION, 24212):QMAKE_CXXFLAGS += -d2SSAOptimizer- + QMAKE_DOCS = $$PWD/doc/qtqml.qdocconf # 2415: variable "xx" of static storage duration was declared but never referenced diff --git a/src/quick/scenegraph/util/qsgdefaultpainternode.cpp b/src/quick/scenegraph/util/qsgdefaultpainternode.cpp index e3103341cd..7a92d61016 100644 --- a/src/quick/scenegraph/util/qsgdefaultpainternode.cpp +++ b/src/quick/scenegraph/util/qsgdefaultpainternode.cpp @@ -218,7 +218,7 @@ void QSGDefaultPainterNode::updateGeometry() if (m_actualRenderTarget == QQuickPaintedItem::Image) source = QRectF(0, 0, 1, 1); else - source = QRectF(0, 0, qreal(m_size.width()) / m_fboSize.width(), qreal(m_size.height()) / m_fboSize.height()); + source = QRectF(0, 0, qreal(m_textureSize.width()) / m_fboSize.width(), qreal(m_textureSize.height()) / m_fboSize.height()); QRectF dest(0, 0, m_size.width(), m_size.height()); if (m_actualRenderTarget == QQuickPaintedItem::InvertedYFramebufferObject) dest = QRectF(QPointF(0, m_size.height()), QPointF(m_size.width(), 0)); @@ -300,7 +300,7 @@ void QSGDefaultPainterNode::updateRenderTarget() QSGPainterTexture *texture = new QSGPainterTexture; if (m_actualRenderTarget == QQuickPaintedItem::Image) { texture->setOwnsTexture(true); - texture->setTextureSize(m_size); + texture->setTextureSize(m_textureSize); } else { texture->setTextureId(m_fbo->texture()); texture->setOwnsTexture(false); |