1 files changed, 26 insertions, 1 deletions
diff --git a/tools/qmlviewer/qmlviewer.cpp b/tools/qmlviewer/qmlviewer.cpp
index cdabd86..e9af477 100644
--- a/tools/qmlviewer/qmlviewer.cpp
+++ b/tools/qmlviewer/qmlviewer.cpp
@@ -17,6 +17,7 @@
 #include "qmlviewer.h"
 #include <QtDeclarative/qmlcontext.h>
 #include <QtDeclarative/qmlengine.h>
+#include "qmlpalette.h"
 #include "qml.h"
 #include <private/qperformancelog_p.h>
 #include "deviceskin.h"
@@ -132,6 +133,8 @@ QmlViewer::QmlViewer(QWidget *parent, Qt::WindowFlags flags)
     devicemode = false;
     skin = 0;
     canvas = 0;
+    palette = 0;
+    disabledPalette = 0;
     record_autotime = 0;
     record_period = 20;
 
@@ -324,7 +327,7 @@ void QmlViewer::toggleRecording()
 
 void QmlViewer::addLibraryPath(const QString& lib)
 {
-    canvas->engine()->addNameSpacePath("",lib);
+    canvas->engine()->addImportPath(lib);
 }
 
 void QmlViewer::reload()
@@ -380,6 +383,7 @@ void QmlViewer::openQml(const QString& fileName)
         }
     }
 
+    setupPalettes();
     canvas->setUrl(url);
 
     QTime t;
@@ -404,6 +408,18 @@ 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)
 {
@@ -483,6 +499,15 @@ 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;