diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-07-29 01:36:23 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-07-29 01:36:23 (GMT) |
| commit | 452a5c855bdccc8bbe0c95f7cb74c4309d0ecc64 (patch) | |
| tree | 44621312c2a44a2645d9cadd786bf2d013883632 /examples/declarative | |
| parent | b155698f5408b9753a6b28e6c2833d83aff2ceb4 (diff) | |
| parent | 93ad359f93de72ef8c4d5f0073dc20ba22b9023c (diff) | |
| download | Qt-452a5c855bdccc8bbe0c95f7cb74c4309d0ecc64.zip Qt-452a5c855bdccc8bbe0c95f7cb74c4309d0ecc64.tar.gz Qt-452a5c855bdccc8bbe0c95f7cb74c4309d0ecc64.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'examples/declarative')
| -rw-r--r-- | examples/declarative/loader/Browser.qml | 2 | ||||
| -rw-r--r-- | examples/declarative/loader/main.cpp | 3 |
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 fd02b6a..070ba75 100644 --- a/examples/declarative/loader/main.cpp +++ b/examples/declarative/loader/main.cpp @@ -11,7 +11,7 @@ #include <QmlContext> #include <QmlComponent> #include <qfxview.h> -#include "qmlpalette.h" +#include <QDebug> QFxView *canvas = 0; @@ -173,7 +173,6 @@ int main(int argc, char *argv[]) QmlContext *ctxt = canvas->rootContext(); ctxt->setContextProperty("qmlLauncher", launcher); - ctxt->setContextProperty("activePalette", new QmlPalette); canvas->setUrl(QUrl("qrc:/loader.qml")); #ifdef Q_OS_SYMBIAN canvas->setContentResizable(true); |