diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-07 08:17:33 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-07 09:10:35 (GMT) |
commit | 6c901f67fb2f2e73fa362e72d985a04fa57cdf48 (patch) | |
tree | 583aab2bd1a6ccac33d310df3e8149da0aece0d5 /src/declarative | |
parent | 131541866b374b90e04af75ec1382154c78b69b9 (diff) | |
download | Qt-6c901f67fb2f2e73fa362e72d985a04fa57cdf48.zip Qt-6c901f67fb2f2e73fa362e72d985a04fa57cdf48.tar.gz Qt-6c901f67fb2f2e73fa362e72d985a04fa57cdf48.tar.bz2 |
Doc
Diffstat (limited to 'src/declarative')
-rw-r--r-- | src/declarative/qml/qmlcomponent.cpp | 6 | ||||
-rw-r--r-- | src/declarative/qml/qmlmetaproperty.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp index 3474487..a9f5442 100644 --- a/src/declarative/qml/qmlcomponent.cpp +++ b/src/declarative/qml/qmlcomponent.cpp @@ -270,18 +270,18 @@ QmlComponent::QmlComponent(QmlEngine *engine, const QUrl &url, QObject *parent) } /*! - Create a QmlComponent from the given \a url and give it the specified + Create a QmlComponent from the given \a fileName and give it the specified \a parent and \a engine. \sa loadUrl() */ -QmlComponent::QmlComponent(QmlEngine *engine, const QString &url, +QmlComponent::QmlComponent(QmlEngine *engine, const QString &fileName, QObject *parent) : QObject(*(new QmlComponentPrivate), parent) { Q_D(QmlComponent); d->engine = engine; - loadUrl(QUrl(url)); + loadUrl(QUrl::fromLocalFile(fileName)); } /*! diff --git a/src/declarative/qml/qmlmetaproperty.cpp b/src/declarative/qml/qmlmetaproperty.cpp index ee24074..e158adf 100644 --- a/src/declarative/qml/qmlmetaproperty.cpp +++ b/src/declarative/qml/qmlmetaproperty.cpp @@ -578,7 +578,7 @@ void QmlMetaPropertyPrivate::findSignalInt(QObject *obj, const QString &name) const QMetaObject *mo = obj->metaObject(); int methods = mo->methodCount(); - for (int ii = 0; ii < methods; ++ii) { + for (int ii = methods - 1; ii >= 0; --ii) { QMetaMethod method = mo->method(ii); QString methodName = QLatin1String(method.signature()); int idx = methodName.indexOf(QLatin1Char('(')); |