summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativeengine_p.h
diff options
context:
space:
mode:
authormae <qt-info@nokia.com>2010-03-11 17:32:04 (GMT)
committermae <qt-info@nokia.com>2010-03-11 17:34:15 (GMT)
commit62c72ed2fd4aa6f5e62a190abf2dde2ba0f5ff0b (patch)
treed002968767e301fb99c533b306cbdfc2f937b16f /src/declarative/qml/qdeclarativeengine_p.h
parent83639a479ef41257c9e06074e81b7c3304a1e982 (diff)
downloadQt-62c72ed2fd4aa6f5e62a190abf2dde2ba0f5ff0b.zip
Qt-62c72ed2fd4aa6f5e62a190abf2dde2ba0f5ff0b.tar.gz
Qt-62c72ed2fd4aa6f5e62a190abf2dde2ba0f5ff0b.tar.bz2
Fix importing qml modules from rcc resources
Done with Roberto. Reviewed-by: Roberto Raggi
Diffstat (limited to 'src/declarative/qml/qdeclarativeengine_p.h')
-rw-r--r--src/declarative/qml/qdeclarativeengine_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeengine_p.h b/src/declarative/qml/qdeclarativeengine_p.h
index 459a325..fb63164 100644
--- a/src/declarative/qml/qdeclarativeengine_p.h
+++ b/src/declarative/qml/qdeclarativeengine_p.h
@@ -276,7 +276,7 @@ public:
QString resolvePlugin(const QDir &dir, const QString &baseName);
- bool addToImport(Imports*, const QString& qmlDirContent,const QString& uri, const QString& prefix, int vmaj, int vmin, QDeclarativeScriptParser::Import::Type importType) const;
+ bool addToImport(Imports*, const QString& uri, const QString& prefix, int vmaj, int vmin, QDeclarativeScriptParser::Import::Type importType) const;
bool resolveType(const Imports&, const QByteArray& type,
QDeclarativeType** type_return, QUrl* url_return,
int *version_major, int *version_minor,