diff options
| author | Chris Adams <christopher.adams@nokia.com> | 2011-08-03 15:45:47 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-04 02:37:58 +0200 |
| commit | 02a19405aab1df31a40896de3d928d8878402052 (patch) | |
| tree | ca07a8e64051e1d16eaa3a7c88e668d8f59a1704 /tests | |
| parent | 6aa16ad7728094f94f113aa9c12a4b135eb135f4 (diff) | |
Fix crash in QDeclarativeProperty
This commit ensures that we don't attempt to dereference a null
pointer in QDeclarativeProperty. It also fixes a unit test failure
by adding appropriate test files.
Related to commit 9f9b23fd7943a3d125cb1cc9f333ce430b2706ea
Task-number: QTBUG-14697
Change-Id: Ic60521e46401835029e293349a00610342d0d58f
Reviewed-on: http://codereview.qt.nokia.com/2538
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeproperty/data/NoContextTypeA.qml | 5 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativeproperty/data/NoContextTypeB.qml | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativeproperty/data/NoContextTypeA.qml b/tests/auto/declarative/qdeclarativeproperty/data/NoContextTypeA.qml new file mode 100644 index 0000000000..f58967cbb2 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeproperty/data/NoContextTypeA.qml @@ -0,0 +1,5 @@ +import QtQuick 2.0 + +QtObject { + property string someString +} diff --git a/tests/auto/declarative/qdeclarativeproperty/data/NoContextTypeB.qml b/tests/auto/declarative/qdeclarativeproperty/data/NoContextTypeB.qml new file mode 100644 index 0000000000..4b3672873d --- /dev/null +++ b/tests/auto/declarative/qdeclarativeproperty/data/NoContextTypeB.qml @@ -0,0 +1,5 @@ +import QtQuick 2.0 + +QtObject { + property NoContextTypeA myTypeA +} |