diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-09-08 05:30:38 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-09-08 05:30:38 (GMT) |
| commit | cad3b0bdacdbdf407dfbdda5f6dc9cb7d96fa709 (patch) | |
| tree | 37a16ff73fe102ac0cd169b20f9b12135903d33a /src/declarative/util/qfxview.cpp | |
| parent | 5305831c3b0d58a61efadc1c1d3ce9ce4d6e8c77 (diff) | |
| parent | b9a924a1e77faeeba595d0619afb14e8fdbb2dd4 (diff) | |
| download | Qt-cad3b0bdacdbdf407dfbdda5f6dc9cb7d96fa709.zip Qt-cad3b0bdacdbdf407dfbdda5f6dc9cb7d96fa709.tar.gz Qt-cad3b0bdacdbdf407dfbdda5f6dc9cb7d96fa709.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/util/qfxview.cpp')
| -rw-r--r-- | src/declarative/util/qfxview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/util/qfxview.cpp b/src/declarative/util/qfxview.cpp index 9291e1a..2a38cda 100644 --- a/src/declarative/util/qfxview.cpp +++ b/src/declarative/util/qfxview.cpp @@ -222,7 +222,7 @@ void QFxView::execute() if (d->qml.isEmpty()) { d->component = new QmlComponent(&d->engine, d->source, this); } else { - d->component = new QmlComponent(&d->engine, d->qml.toUtf8(), d->source); + d->component = new QmlComponent(&d->engine, d->qml.toUtf8(), d->source, this); } if (!d->component->isLoading()) { |