Merge remote-tracking branch 'origin/KDE/4.10'

Conflicts:
	plasma/applets/folderview/folderview.cpp

CCMAIL: [email protected]

@Ignat: We've been following a merge-based approach in kde-baseapps
for quite some time now, see

http://lists.kde.org/?t=134744909400005&r=1&w=1

It would be nice if you could merge KDE/4.10 into master after any
non-trivial changes in folderview to prevent that others have to
figure out how to resolve the merge conflicts. Thanks!

1 files changed, 9 insertions, 3 deletions

diff --git a/src/kitemviews/kitemlistviewaccessible.cpp b/src/kitemviews/kitemlistviewaccessible.cpp
index d4b8bf6e6..565c2151e 100644
--- a/src/kitemviews/kitemlistviewaccessible.cpp
+++ b/src/kitemviews/kitemlistviewaccessible.cpp
@@ -242,9 +242,15 @@ QRect KItemListViewAccessible::rect(int child) const
     if (!view()->isVisible()) {
         return QRect();
     }
-    const QPoint origin = view()->scene()->views()[0]->mapToGlobal(QPoint(0, 0));
-    const QRect viewRect = view()->geometry().toRect();
-    return viewRect.translated(origin);
+
+    const QGraphicsScene* scene = view()->scene();
+    if (scene) {
+        const QPoint origin = scene->views()[0]->mapToGlobal(QPoint(0, 0));
+        const QRect viewRect = view()->geometry().toRect();
+        return viewRect.translated(origin);
+    } else {
+        return QRect();
+    }
 }
 
 int KItemListViewAccessible::navigate(RelationFlag relation, int index, QAccessibleInterface** interface) const