diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-06-14 12:24:20 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-06-14 12:24:25 +0200 |
commit | e02b1ca3c2d8525d5fb3321774136978eab465c9 (patch) | |
tree | 7a94a6c615ebcc0942e4c682064b4fc426edd3d6 /recipes-qt | |
parent | da60ee1856a65ddcc349c5b42ae88d29e31c1e94 (diff) |
qtdeclarative-git: Add 2 patches from 5.0.2
* 0002-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch is
applied in newer SRCREV
* 0001-Fix-wrong-calculation-of-viewPort-for-transitions.patch is still
pending
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt')
3 files changed, 82 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtdeclarative-git/0001-Fix-wrong-calculation-of-viewPort-for-transitions.patch b/recipes-qt/qt5/qtdeclarative-git/0001-Fix-wrong-calculation-of-viewPort-for-transitions.patch new file mode 100644 index 00000000..5f201f97 --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative-git/0001-Fix-wrong-calculation-of-viewPort-for-transitions.patch @@ -0,0 +1,41 @@ +From b93b61260b8eda33c01cef542777efbae2e8c570 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Florian=20H=C3=A4nel?= <florian.haenel@basyskom.com> +Date: Wed, 5 Jun 2013 19:23:32 +0200 +Subject: [PATCH 1/2] Fix wrong calculation of viewPort for transitions + +Viewport is calculated wrong for horizontal layout in a second instance + +Task-number: QTBUG-29944 +Task-Number: QTBUG-31546 + +Upstream-Status: Pending + +Looks like backport of https://codereview.qt-project.org/49226 but this +one was applied in previous patch, this change looks the same but is +in different part of qquickitemview.cpp and ISN'T applied yet in dev +branch. + +Signed-off-by: Florian Haenel <florian.haenel@lge.com> +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + +Change-Id: I136ae4484278d14f796613505e3f38c65ec51ebe +--- + src/quick/items/qquickitemview.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp +index d774091..aa489eb 100644 +--- a/src/quick/items/qquickitemview.cpp ++++ b/src/quick/items/qquickitemview.cpp +@@ -1815,7 +1815,7 @@ void QQuickItemViewPrivate::layout() + + prepareVisibleItemTransitions(); + +- QRectF viewBounds(0, position(), q->width(), q->height()); ++ QRectF viewBounds(q->contentX(), q->contentY(), q->width(), q->height()); + for (QList<FxViewItem*>::Iterator it = releasePendingTransition.begin(); + it != releasePendingTransition.end(); ) { + FxViewItem *item = *it; +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtdeclarative-git/0002-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch b/recipes-qt/qt5/qtdeclarative-git/0002-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch new file mode 100644 index 00000000..a61f8de2 --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative-git/0002-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch @@ -0,0 +1,37 @@ +From b47cfc601cf5d3c67289f72f43293846371993e2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Florian=20H=C3=A4nel?= <florian.haenel@basyskom.com> +Date: Mon, 3 Jun 2013 13:40:09 +0200 +Subject: [PATCH 2/2] Fix null-pointer access in QQuickVisualDataModelPrivate + +I observed null cachItem->contextData which lead to null-pointer access +on cacheItem->contextData->destroy(). + +Task-number: QTBUG-31439 + +Upstream-Status: Backport https://codereview.qt-project.org/57789 + +Signed-of-by: Florian Haenel <florian.haenel@lge.com> +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + +Change-Id: I91f28a3ee1ac83446ecde1801a1cb7962fb883f3 +--- + src/qml/types/qqmldelegatemodel.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp +index 16572c4..f457538 100644 +--- a/src/qml/types/qqmldelegatemodel.cpp ++++ b/src/qml/types/qqmldelegatemodel.cpp +@@ -835,7 +835,8 @@ void QQmlDelegateModelPrivate::incubatorStatusChanged(QQDMIncubationTask *incuba + delete cacheItem->object; + cacheItem->object = 0; + cacheItem->scriptRef -= 1; +- cacheItem->contextData->destroy(); ++ if (cacheItem->contextData) ++ cacheItem->contextData->destroy(); + cacheItem->contextData = 0; + + if (!cacheItem->isReferenced()) { +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index b7f79bf2..e1418db5 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -3,4 +3,8 @@ require ${PN}.inc PR = "${INC_PR}.0" +SRC_URI += "file://0001-Fix-wrong-calculation-of-viewPort-for-transitions.patch \ + file://0002-Fix-null-pointer-access-in-QQuickVisualDataModelPriv.patch \ +" + SRCREV = "1d594c4e10caa9258f00bb7bcf61c307d027633b" |