Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui

3 files changed, 5 insertions, 5 deletions

diff --git a/examples/multitouch/pinchzoom/graphicsview.cpp b/examples/multitouch/pinchzoom/graphicsview.cpp
index 3d0e49f..969f604 100644
--- a/examples/multitouch/pinchzoom/graphicsview.cpp
+++ b/examples/multitouch/pinchzoom/graphicsview.cpp
@@ -47,11 +47,11 @@
 GraphicsView::GraphicsView(QGraphicsScene *scene, QWidget *parent)
     : QGraphicsView(scene, parent)
 {
-    setAttribute(Qt::WA_AcceptTouchEvents);
+    viewport()->setAttribute(Qt::WA_AcceptTouchEvents);
     setDragMode(ScrollHandDrag);
 }
 
-bool GraphicsView::event(QEvent *event)
+bool GraphicsView::viewportEvent(QEvent *event)
 {
     switch (event->type()) {
     case QEvent::TouchBegin:
@@ -72,5 +72,5 @@ bool GraphicsView::event(QEvent *event)
     default:
         break;
     }
-    return QGraphicsView::event(event);
+    return QGraphicsView::viewportEvent(event);
 }
diff --git a/examples/multitouch/pinchzoom/graphicsview.h b/examples/multitouch/pinchzoom/graphicsview.h
index 928fd16..e4ca65d 100644
--- a/examples/multitouch/pinchzoom/graphicsview.h
+++ b/examples/multitouch/pinchzoom/graphicsview.h
@@ -49,5 +49,5 @@ class GraphicsView : public QGraphicsView
 public:
     GraphicsView(QGraphicsScene *scene = 0, QWidget *parent = 0);
 
-    bool event(QEvent *event);
+    bool viewportEvent(QEvent *event);
 };
diff --git a/examples/phonon/musicplayer/mainwindow.cpp b/examples/phonon/musicplayer/mainwindow.cpp
index 7403e33..a20d05f 100644
--- a/examples/phonon/musicplayer/mainwindow.cpp
+++ b/examples/phonon/musicplayer/mainwindow.cpp
@@ -184,7 +184,7 @@ void MainWindow::metaStateChanged(Phonon::State newState, Phonon::State /* oldSt
         QMessageBox::warning(this, tr("Error opening files"),
             metaInformationResolver->errorString());
         while (!sources.isEmpty() &&
-               !(sources.takeLast() == metaInformationResolver->currentSource()));
+               !(sources.takeLast() == metaInformationResolver->currentSource())) /* loop */;
         return;
     }