From 6aa3624edecb4ab0ad2e3d0e189254a5b561672d Mon Sep 17 00:00:00 2001
From: Jason Barron <jbarron@trolltech.com>
Date: Tue, 7 Jul 2009 11:28:59 +0200
Subject: Compile fixes for S60 + 4.6.

Update some things after pulling in master-stable to get things
compiling again.
---
 src/corelib/kernel/qcoreevent.h         | 5 +++--
 src/gui/graphicsview/qgraphicsscene.cpp | 6 +++---
 src/gui/widgets/qmenu.cpp               | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/corelib/kernel/qcoreevent.h b/src/corelib/kernel/qcoreevent.h
index dbfea95..7f8041c 100644
--- a/src/corelib/kernel/qcoreevent.h
+++ b/src/corelib/kernel/qcoreevent.h
@@ -271,8 +271,6 @@ public:
 
         Signal = 192,
         Wrapped = 193,
-        RequestSoftwareInputPanel = 194,
-        CloseSoftwareInputPanel = 195,
 
         TouchBegin = 194,
         TouchUpdate = 195,
@@ -281,6 +279,9 @@ public:
         Gesture = 197,
         GraphicsSceneGesture = 198,
 
+        RequestSoftwareInputPanel = 199,
+        CloseSoftwareInputPanel = 200,
+
         // 512 reserved for Qt Jambi's MetaCall event
         // 513 reserved for Qt Jambi's DeleteOnMainThread event
 
diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp
index eb9af3f..13d3bd6 100644
--- a/src/gui/graphicsview/qgraphicsscene.cpp
+++ b/src/gui/graphicsview/qgraphicsscene.cpp
@@ -5543,14 +5543,14 @@ void QGraphicsScenePrivate::processDirtyItemsRecursive(QGraphicsItem *item, bool
 
                 bool valid = false;
                 if (untransformableItem) {
-                    valid = updateHelper(viewPrivate, item->d_ptr, dirtyRect,
+                    valid = updateHelper(viewPrivate, item->d_ptr.data(), dirtyRect,
                                          item->deviceTransform(view->viewportTransform()));
                 } else if (!view->isTransformed()) {
-                    valid = updateHelper(viewPrivate, item->d_ptr, dirtyRect, item->d_ptr->sceneTransform);
+                    valid = updateHelper(viewPrivate, item->d_ptr.data(), dirtyRect, item->d_ptr->sceneTransform);
                 } else {
                     QTransform deviceTransform = item->d_ptr->sceneTransform;
                     deviceTransform *= view->viewportTransform();
-                    valid = updateHelper(viewPrivate, item->d_ptr, dirtyRect, deviceTransform);
+                    valid = updateHelper(viewPrivate, item->d_ptr.data(), dirtyRect, deviceTransform);
                 }
                 if (!valid)
                     paintedViewBoundingRect = QRect();
diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp
index fd69a52..079a3b5 100644
--- a/src/gui/widgets/qmenu.cpp
+++ b/src/gui/widgets/qmenu.cpp
@@ -1783,7 +1783,7 @@ void QMenu::popup(const QPoint &p, QAction *atAction)
             atAction = d->defaultAction;
             // TODO: This works for first level menus, not yet sub menus
         } else {
-            foreach (QAction *action, d->actionList)
+            foreach (QAction *action, d->actions)
                 if (action->isEnabled()) {
                     atAction = action;
                     break;
-- 
cgit v0.12