summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativeengine_p.h
diff options
context:
space:
mode:
authormae <qt-info@nokia.com>2010-04-26 08:59:46 (GMT)
committermae <qt-info@nokia.com>2010-04-26 09:02:02 (GMT)
commitc3be50311d8d343609aa4f108e4e713d367e2907 (patch)
tree335ed095fa8e82729b3c6c4da0a7a38456fd0bb0 /src/declarative/qml/qdeclarativeengine_p.h
parentb64226e7b8cb1c9922b5419b27e0888c3215aae3 (diff)
downloadQt-c3be50311d8d343609aa4f108e4e713d367e2907.zip
Qt-c3be50311d8d343609aa4f108e4e713d367e2907.tar.gz
Qt-c3be50311d8d343609aa4f108e4e713d367e2907.tar.bz2
Improved error messages for type resolving, new debug option
The patch improves the error messages when type resolving fails and introduces a new debug utility QML_CHECK_TYPES. If the environment variable is defined, type shadowing will be reported as error. Reviewed-by: Warwick Allison
Diffstat (limited to 'src/declarative/qml/qdeclarativeengine_p.h')
-rw-r--r--src/declarative/qml/qdeclarativeengine_p.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeengine_p.h b/src/declarative/qml/qdeclarativeengine_p.h
index f6b9bcb..743275e 100644
--- a/src/declarative/qml/qdeclarativeengine_p.h
+++ b/src/declarative/qml/qdeclarativeengine_p.h
@@ -290,7 +290,8 @@ public:
bool resolveType(const Imports&, const QByteArray& type,
QDeclarativeType** type_return, QUrl* url_return,
int *version_major, int *version_minor,
- ImportedNamespace** ns_return) const;
+ ImportedNamespace** ns_return,
+ QString *errorString = 0) const;
void resolveTypeInNamespace(ImportedNamespace*, const QByteArray& type,
QDeclarativeType** type_return, QUrl* url_return,
int *version_major, int *version_minor ) const;