summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-05-20 03:31:43 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-05-20 03:31:43 (GMT)
commite8652a9313fd1a3116b001b61db8a63386cecf77 (patch)
tree93df12c65b24b95e8c27e36c4e88d44aaeca3891
parentc047b77c7f5a3a4ff942673f2e1936a8e11a99a9 (diff)
downloadQt-e8652a9313fd1a3116b001b61db8a63386cecf77.zip
Qt-e8652a9313fd1a3116b001b61db8a63386cecf77.tar.gz
Qt-e8652a9313fd1a3116b001b61db8a63386cecf77.tar.bz2
Add return value for resolveTypeInNamespace
-rw-r--r--src/declarative/qml/qdeclarativeimport.cpp4
-rw-r--r--src/declarative/qml/qdeclarativeimport_p.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/qml/qdeclarativeimport.cpp b/src/declarative/qml/qdeclarativeimport.cpp
index cb36818..0c87671 100644
--- a/src/declarative/qml/qdeclarativeimport.cpp
+++ b/src/declarative/qml/qdeclarativeimport.cpp
@@ -678,11 +678,11 @@ bool QDeclarativeImportDatabase::resolveType(const QDeclarativeImports& imports,
If either return pointer is 0, the corresponding search is not done.
*/
-void QDeclarativeImportDatabase::resolveTypeInNamespace(QDeclarativeImportedNamespace* ns, const QByteArray& type,
+bool QDeclarativeImportDatabase::resolveTypeInNamespace(QDeclarativeImportedNamespace* ns, const QByteArray& type,
QDeclarativeType** type_return, QUrl* url_return,
int *vmaj, int *vmin) const
{
- ns->find(type,vmaj,vmin,type_return,url_return);
+ return ns->find(type,vmaj,vmin,type_return,url_return);
}
/*!
diff --git a/src/declarative/qml/qdeclarativeimport_p.h b/src/declarative/qml/qdeclarativeimport_p.h
index 62b0517..88246d4 100644
--- a/src/declarative/qml/qdeclarativeimport_p.h
+++ b/src/declarative/qml/qdeclarativeimport_p.h
@@ -112,7 +112,7 @@ public:
int *version_major, int *version_minor,
QDeclarativeImportedNamespace** ns_return,
QString *errorString = 0) const;
- void resolveTypeInNamespace(QDeclarativeImportedNamespace*, const QByteArray& type,
+ bool resolveTypeInNamespace(QDeclarativeImportedNamespace*, const QByteArray& type,
QDeclarativeType** type_return, QUrl* url_return,
int *version_major, int *version_minor ) const;