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

Conflicts:
	src/declarative/canvas/qsimplecanvas.cpp
	src/declarative/canvas/qsimplecanvasdebugplugin.cpp
	src/declarative/canvas/qsimplecanvasdebugplugin_p.h
	src/declarative/fx/qfxpainteditem.cpp
	src/declarative/util/qfxview.cpp
	tools/qmlviewer/qmlviewer.h

1 files changed, 5 insertions, 0 deletions

diff --git a/tools/qmlviewer/qmlviewer.h b/tools/qmlviewer/qmlviewer.h
index c46f185..365d6b2 100644
--- a/tools/qmlviewer/qmlviewer.h
+++ b/tools/qmlviewer/qmlviewer.h
@@ -24,6 +24,7 @@ QT_BEGIN_NAMESPACE
 class QFxView;
 class PreviewDeviceSkin;
 class QFxTestEngine;
+class QmlPalette;
 class QProcess;
 
 class QmlViewer : public QWidget
@@ -60,6 +61,7 @@ public slots:
 protected:
     virtual void keyPressEvent(QKeyEvent *);
     virtual void timerEvent(QTimerEvent *);
+    virtual bool event(QEvent *event);
 
     void createMenu(QMenuBar *menu, QMenu *flatmenu);
 
@@ -69,11 +71,14 @@ private slots:
 
 private:
     void setupProxy();
+    void setupPalettes();
 
     QString currentFileName;
     PreviewDeviceSkin *skin;
     QSize skinscreensize;
     QFxView *canvas;
+    QmlPalette *palette;
+    QmlPalette *disabledPalette;
     QBasicTimer recordTimer;
     QList<QImage*> frames;
     QProcess* frame_stream;