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

Conflicts:
	tools/qmlviewer/qmlviewer.h

2 files changed, 0 insertions, 21 deletions

diff --git a/tools/qmlviewer/qmlviewer.cpp b/tools/qmlviewer/qmlviewer.cpp
index 643760b..f20e8eb 100644
--- a/tools/qmlviewer/qmlviewer.cpp
+++ b/tools/qmlviewer/qmlviewer.cpp
@@ -17,7 +17,6 @@
 #include "qmlviewer.h"
 #include <QtDeclarative/qmlcontext.h>
 #include <QtDeclarative/qmlengine.h>
-#include "qmlpalette.h"
 #include "qml.h"
 #include <private/qperformancelog_p.h>
 #include <QAbstractAnimation>
@@ -209,8 +208,6 @@ QmlViewer::QmlViewer(QWidget *parent, Qt::WindowFlags flags)
     devicemode = false;
     skin = 0;
     canvas = 0;
-    palette = 0;
-    disabledPalette = 0;
     record_autotime = 0;
     record_rate = 50;
     record_args += QLatin1String("-sameq");
@@ -534,7 +531,6 @@ void QmlViewer::openQml(const QString& fileName)
         }
     }
 
-    setupPalettes();
     canvas->setUrl(url);
 
     QTime t;
@@ -559,19 +555,6 @@ void QmlViewer::openQml(const QString& fileName)
 #endif
 }
 
-void QmlViewer:: setupPalettes()
-{
-    delete palette;
-    palette = new QmlPalette;
-    QmlContext *ctxt = canvas->rootContext();
-    ctxt->setContextProperty("activePalette", palette);
-
-    delete disabledPalette;
-    disabledPalette = new QmlPalette;
-    disabledPalette->setColorGroup(QPalette::Disabled);
-    ctxt->setContextProperty("disabledPalette", disabledPalette);
-}
-
 void QmlViewer::setSkin(const QString& skinDirectory)
 {
     // XXX QWidget::setMask does not handle changes well, and we may
diff --git a/tools/qmlviewer/qmlviewer.h b/tools/qmlviewer/qmlviewer.h
index 15acf72..e3864eb 100644
--- a/tools/qmlviewer/qmlviewer.h
+++ b/tools/qmlviewer/qmlviewer.h
@@ -24,7 +24,6 @@ QT_BEGIN_NAMESPACE
 class QFxView;
 class PreviewDeviceSkin;
 class QFxTestEngine;
-class QmlPalette;
 class QProcess;
 class RecordingDialog;
 
@@ -74,15 +73,12 @@ private slots:
 
 private:
     void setupProxy();
-    void setupPalettes();
     QString getVideoFileName();
 
     QString currentFileName;
     PreviewDeviceSkin *skin;
     QSize skinscreensize;
     QFxView *canvas;
-    QmlPalette *palette;
-    QmlPalette *disabledPalette;
     QmlTimer recordTimer;
     QString frame_fmt;
     QImage frame;