diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-24 23:40:54 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-24 23:40:54 (GMT) |
| commit | 59852c9a855e6b9963c27c9a028faf6d23ea9974 (patch) | |
| tree | 2b3b679a77365027886a57671fe4763987d7963d /src/declarative | |
| parent | 534f5098c577f262b4b01d1c21cd0ec1af0f25f1 (diff) | |
| parent | 565bd12bdc7b73e4222de44699df9904a1cfcd81 (diff) | |
| download | Qt-59852c9a855e6b9963c27c9a028faf6d23ea9974.zip Qt-59852c9a855e6b9963c27c9a028faf6d23ea9974.tar.gz Qt-59852c9a855e6b9963c27c9a028faf6d23ea9974.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
QDeclarativeDebug: Fix autotest
Pass QList as const reference when possible
Fixed crashes in Observer mode related to infinite bounding rects
Doc
QmlDirParser: Fix typeInfo accessor.
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/qml/qdeclarativedirparser.cpp | 2 | ||||
| -rw-r--r-- | src/declarative/qml/qdeclarativeproperty.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativedirparser.cpp b/src/declarative/qml/qdeclarativedirparser.cpp index d4abbee..1d4db40 100644 --- a/src/declarative/qml/qdeclarativedirparser.cpp +++ b/src/declarative/qml/qdeclarativedirparser.cpp @@ -240,7 +240,7 @@ QList<QDeclarativeDirParser::Component> QDeclarativeDirParser::components() cons } #ifdef QT_CREATOR -QList<TypeInfo> QDeclarativeDirParser::typeInfos() const +QList<QDeclarativeDirParser::TypeInfo> QDeclarativeDirParser::typeInfos() const { return _typeInfos; } diff --git a/src/declarative/qml/qdeclarativeproperty.cpp b/src/declarative/qml/qdeclarativeproperty.cpp index e806dbf..ae28049 100644 --- a/src/declarative/qml/qdeclarativeproperty.cpp +++ b/src/declarative/qml/qdeclarativeproperty.cpp @@ -183,6 +183,9 @@ QDeclarativeProperty::QDeclarativeProperty(QObject *obj, const QString &name) /*! Creates a QDeclarativeProperty for the property \a name of \a obj using the \l{QDeclarativeContext} {context} \a ctxt. + + Creating a QDeclarativeProperty without a context will render some + properties - like attached properties - inaccessible. */ QDeclarativeProperty::QDeclarativeProperty(QObject *obj, const QString &name, QDeclarativeContext *ctxt) : d(new QDeclarativePropertyPrivate) |