summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorYann Bodson <yann.bodson@nokia.com>2009-07-28 12:49:37 (GMT)
committerYann Bodson <yann.bodson@nokia.com>2009-07-28 12:49:37 (GMT)
commit93ad359f93de72ef8c4d5f0073dc20ba22b9023c (patch)
tree2463602896f5d671d62a16c3338a9b7ba8492db1 /examples
parentf95cecebddb8ce0ef40bd691bbe574db1a570b8c (diff)
downloadQt-93ad359f93de72ef8c4d5f0073dc20ba22b9023c.zip
Qt-93ad359f93de72ef8c4d5f0073dc20ba22b9023c.tar.gz
Qt-93ad359f93de72ef8c4d5f0073dc20ba22b9023c.tar.bz2
Fix for QmlPalette
Add a colorGroup property and remove palette properties from the root context.
Diffstat (limited to 'examples')
-rw-r--r--examples/declarative/loader/Browser.qml2
-rw-r--r--examples/declarative/loader/main.cpp3
2 files changed, 3 insertions, 2 deletions
diff --git a/examples/declarative/loader/Browser.qml b/examples/declarative/loader/Browser.qml
index 5696f93..007b998 100644
--- a/examples/declarative/loader/Browser.qml
+++ b/examples/declarative/loader/Browser.qml
@@ -11,6 +11,8 @@ Rect {
// folder: "E:"
}
+ Palette { id: activePalette; colorGroup: "Active" }
+
Component {
id: FolderDelegate
Rect {
diff --git a/examples/declarative/loader/main.cpp b/examples/declarative/loader/main.cpp
index aa86f8f..762212b 100644
--- a/examples/declarative/loader/main.cpp
+++ b/examples/declarative/loader/main.cpp
@@ -5,7 +5,7 @@
#include <QmlContext>
#include <QmlComponent>
#include <qfxview.h>
-#include "qmlpalette.h"
+#include <QDebug>
QFxView *canvas = 0;
@@ -62,7 +62,6 @@ int main(int argc, char *argv[])
canvas = new QFxView;
QmlContext *ctxt = canvas->rootContext();
ctxt->setContextProperty("qmlLauncher", launcher);
- ctxt->setContextProperty("activePalette", new QmlPalette);
canvas->setUrl(QUrl("qrc:/loader.qml"));
canvas->execute();
canvas->show();