diff options
| author | Martin Smith <msmith@trolltech.com> | 2009-04-23 12:40:34 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2009-04-23 12:40:34 (GMT) |
| commit | ffa57d340970f40b924a0813509105b12eb50da2 (patch) | |
| tree | a9b60ba6679e521682638b7e1e0ffed6fe58a582 /src | |
| parent | 0967c3267fd533a9fa092553d30a0baf06aafb60 (diff) | |
| parent | f4671866dec50c624ddd7da08e77d6438b183ff1 (diff) | |
| download | Qt-ffa57d340970f40b924a0813509105b12eb50da2.zip Qt-ffa57d340970f40b924a0813509105b12eb50da2.tar.gz Qt-ffa57d340970f40b924a0813509105b12eb50da2.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/fx/qfxitem.cpp | 4 | ||||
| -rw-r--r-- | src/declarative/util/qfxview.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp index 4574392..ed65b84 100644 --- a/src/declarative/fx/qfxitem.cpp +++ b/src/declarative/fx/qfxitem.cpp @@ -783,7 +783,7 @@ void QFxItem::setQml(const QString &qml) if(!d->_qmlcomp->isLoading()) qmlLoaded(); else - QObject::connect(d->_qmlcomp, SIGNAL(statusChanged(Status)), + QObject::connect(d->_qmlcomp, SIGNAL(statusChanged(QmlComponent::Status)), this, SLOT(qmlLoaded())); } } @@ -1650,7 +1650,7 @@ void QFxItem::newChild(const QString &type) if(!d->_qmlnewcomp.last()->isLoading()) qmlLoaded(); else - connect(d->_qmlnewcomp.last(), SIGNAL(statusChanged(Status)), + connect(d->_qmlnewcomp.last(), SIGNAL(statusChanged(QmlComponent::Status)), this, SLOT(qmlLoaded())); } diff --git a/src/declarative/util/qfxview.cpp b/src/declarative/util/qfxview.cpp index 4aa0932..a8b8eea 100644 --- a/src/declarative/util/qfxview.cpp +++ b/src/declarative/util/qfxview.cpp @@ -203,13 +203,13 @@ void QFxView::execute() if(!d->component->isLoading()) { continueExecute(); } else { - connect(d->component, SIGNAL(statusChanged(Status)), this, SLOT(continueExecute())); + connect(d->component, SIGNAL(statusChanged(QmlComponent::Status)), this, SLOT(continueExecute())); } } void QFxView::continueExecute() { - disconnect(d->component, SIGNAL(statusChanged(Status)), this, SLOT(continueExecute())); + disconnect(d->component, SIGNAL(statusChanged(QmlComponent::Status)), this, SLOT(continueExecute())); if(!d->component){ qWarning() << "Error in loading" << d->source; |