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

Conflicts:
	src/declarative/fx/fx.pri

2 files changed, 1 insertions, 11 deletions

diff --git a/tools/qmlviewer/qmlviewer.cpp b/tools/qmlviewer/qmlviewer.cpp
index e9af477..c9d70e8 100644
--- a/tools/qmlviewer/qmlviewer.cpp
+++ b/tools/qmlviewer/qmlviewer.cpp
@@ -191,7 +191,7 @@ void QmlViewer::createMenu(QMenuBar *menu, QMenu *flatmenu)
     QAction *snapshotAction = new QAction(tr("&Take Snapsot\tF3"), parent);
     connect(snapshotAction, SIGNAL(triggered()), this, SLOT(takeSnapShot()));
     recordMenu->addAction(snapshotAction);
-    
+
     recordAction = new QAction(tr("Start Recording &Video\tF2"), parent);
     connect(recordAction, SIGNAL(triggered()), this, SLOT(toggleRecordingWithSelection()));
     recordMenu->addAction(recordAction);
@@ -499,15 +499,6 @@ void QmlViewer::setRecordFile(const QString& f)
     record_file = f;
 }
 
-bool QmlViewer::event(QEvent *event)
-{
-    if (event->type() == QEvent::PaletteChange) {
-        setupPalettes();
-        return true;
-    }
-    return QWidget::event(event);
-}
-
 void QmlViewer::setRecordPeriod(int ms)
 {
     record_period = ms;
diff --git a/tools/qmlviewer/qmlviewer.h b/tools/qmlviewer/qmlviewer.h
index 365d6b2..4714bdc 100644
--- a/tools/qmlviewer/qmlviewer.h
+++ b/tools/qmlviewer/qmlviewer.h
@@ -61,7 +61,6 @@ public slots:
 protected:
     virtual void keyPressEvent(QKeyEvent *);
     virtual void timerEvent(QTimerEvent *);
-    virtual bool event(QEvent *event);
 
     void createMenu(QMenuBar *menu, QMenu *flatmenu);