diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-11 01:00:05 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-11 01:00:05 +0200 |
commit | f3daa8bb97bbfc7a309c2bf59de1e41d279e05d1 (patch) | |
tree | 5d0c805090f2ab3d0e42b5cda21f9383dbdd883d | |
parent | de2f5d2bc11a71fe12fcc4c08fff9bf59571db36 (diff) | |
parent | e48a10d40001c6efdb3b875c1d0087674dee2a48 (diff) |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: Ieaf0811cf045af1e6df4db4ab67d7c38ba0d1fbf
-rw-r--r-- | dist/changes-5.11.2 | 60 | ||||
-rw-r--r-- | examples/quick/shared/LauncherList.qml | 2 | ||||
-rw-r--r-- | src/imports/xmllistmodel/xmllistmodel.pro | 2 | ||||
-rw-r--r-- | src/qml/doc/src/external-resources.qdoc | 4 | ||||
-rw-r--r-- | src/quick/scenegraph/qsgrenderloop.cpp | 12 |
5 files changed, 73 insertions, 7 deletions
diff --git a/dist/changes-5.11.2 b/dist/changes-5.11.2 new file mode 100644 index 0000000000..2d48d99cdb --- /dev/null +++ b/dist/changes-5.11.2 @@ -0,0 +1,60 @@ +Qt 5.11.2 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.11.0 through 5.11.1. + +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.11 series is binary compatible with the 5.10.x series. +Applications compiled for 5.10 will continue to run with 5.11. + +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.11.2 Changes * +**************************************************************************** + +**************************************************************************** +* QtQml * +**************************************************************************** + + - [QTBUG-69328] Fixed crashes with unaligned memory access on ARM. + - [QTBUG-69475] Fixed quadratic GC behavior when allocating very large + objects. + - [QTBUG-68323] qmlRegisterType, qmlRegisterUncreateableType etc. will + now show error messages when they fail. + +**************************************************************************** +* QtQuick * +**************************************************************************** + + - Events: + * [QTBUG-61749] Fixed a warning about unregistered datatype + QQuickPointerDevice. + + - Image: + * [QTBUG-66116] Fixed a memory leak when updating images in an + invisible window. + + - Item Views: + * [QTBUG-67460] Fixed ListView getting stuck while scrolling after + setting currentIndex. + + - Loader: + * Fixed a leak of Components when changing source url. + * [QTBUG-68738] Fixed a crash when using setSource() in an asynchronous + Loader. + + - Layouts: + * [QTBUG-63269] Fixed items in layouts not being rendered when layers + are used. + + - Localization and internationalization: + * [QTBUG-69196] Improved l10n and i18n in examples. diff --git a/examples/quick/shared/LauncherList.qml b/examples/quick/shared/LauncherList.qml index e532b53e7f..a4c75e544e 100644 --- a/examples/quick/shared/LauncherList.qml +++ b/examples/quick/shared/LauncherList.qml @@ -106,8 +106,6 @@ Rectangle { anchors.fill: parent } - x: -width - function show() { showAnim.start() } diff --git a/src/imports/xmllistmodel/xmllistmodel.pro b/src/imports/xmllistmodel/xmllistmodel.pro index 8ee9ea311f..1e61f4d3d9 100644 --- a/src/imports/xmllistmodel/xmllistmodel.pro +++ b/src/imports/xmllistmodel/xmllistmodel.pro @@ -10,3 +10,5 @@ SOURCES += qqmlxmllistmodel.cpp plugin.cpp HEADERS += qqmlxmllistmodel_p.h load(qml_plugin) + +requires(qtConfig(qml-network)) diff --git a/src/qml/doc/src/external-resources.qdoc b/src/qml/doc/src/external-resources.qdoc index d26288ee6e..68c5ab4664 100644 --- a/src/qml/doc/src/external-resources.qdoc +++ b/src/qml/doc/src/external-resources.qdoc @@ -69,6 +69,10 @@ \title Qt Creator Manual */ /*! + \externalpage https://doc.qt.io/qtcreator/creator-project-creating.html#creating-resource-files + \title Creating Resource Files +*/ +/*! \externalpage https://fontawesome.com/ \title Font Awesome */ diff --git a/src/quick/scenegraph/qsgrenderloop.cpp b/src/quick/scenegraph/qsgrenderloop.cpp index 79bfe95e90..3d579fde46 100644 --- a/src/quick/scenegraph/qsgrenderloop.cpp +++ b/src/quick/scenegraph/qsgrenderloop.cpp @@ -351,11 +351,16 @@ void QSGGuiThreadRenderLoop::windowDestroyed(QQuickWindow *window) void QSGGuiThreadRenderLoop::renderWindow(QQuickWindow *window) { - QQuickWindowPrivate *cd = QQuickWindowPrivate::get(window); - if (!cd->isRenderable() || !m_windows.contains(window)) + if (!m_windows.contains(window)) return; WindowData &data = const_cast<WindowData &>(m_windows[window]); + bool alsoSwap = data.updatePending; + data.updatePending = false; + + QQuickWindowPrivate *cd = QQuickWindowPrivate::get(window); + if (!cd->isRenderable()) + return; bool current = false; @@ -382,9 +387,6 @@ void QSGGuiThreadRenderLoop::renderWindow(QQuickWindow *window) current = gl->makeCurrent(window); } - bool alsoSwap = data.updatePending; - data.updatePending = false; - bool lastDirtyWindow = true; auto i = m_windows.constBegin(); while (i != m_windows.constEnd()) { |