diff options
author | Thierry Bastian <thierry.bastian@nokia.com> | 2009-04-30 11:51:22 (GMT) |
---|---|---|
committer | Thierry Bastian <thierry.bastian@nokia.com> | 2009-04-30 11:52:12 (GMT) |
commit | 052e6a8e82b707749be2ecbad1af60effecefebb (patch) | |
tree | 53ee18b87c30e4835414a2acc734905a78e64e98 /src/declarative/qml | |
parent | 9442115ce46e87bb5a5939980cf900702dc4a87a (diff) | |
download | Qt-052e6a8e82b707749be2ecbad1af60effecefebb.zip Qt-052e6a8e82b707749be2ecbad1af60effecefebb.tar.gz Qt-052e6a8e82b707749be2ecbad1af60effecefebb.tar.bz2 |
Removed a fiew compilation warnings on MSVC
Diffstat (limited to 'src/declarative/qml')
-rw-r--r-- | src/declarative/qml/qmlcomponent.h | 2 | ||||
-rw-r--r-- | src/declarative/qml/qmldom.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlcomponent.h b/src/declarative/qml/qmlcomponent.h index 83d08ea..0493c1f 100644 --- a/src/declarative/qml/qmlcomponent.h +++ b/src/declarative/qml/qmlcomponent.h @@ -98,7 +98,7 @@ private: QmlComponent(QmlEngine *, QmlCompiledComponent *, int, int, QObject *parent); friend class QmlVME; - friend class QmlCompositeTypeData; + friend struct QmlCompositeTypeData; }; QML_DECLARE_TYPE(QmlComponent); diff --git a/src/declarative/qml/qmldom.cpp b/src/declarative/qml/qmldom.cpp index 4e8e1f7..937c244 100644 --- a/src/declarative/qml/qmldom.cpp +++ b/src/declarative/qml/qmldom.cpp @@ -150,6 +150,8 @@ int QmlDomDocument::version() const */ bool QmlDomDocument::load(QmlEngine *engine, const QByteArray &data) { + Q_UNUSED(engine); + d->error = QString(); QmlScriptParser parser; |