summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativelanguage/data
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-07-01 13:00:57 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-07-01 13:00:57 (GMT)
commit405ae4ef5382cd8ee0adfbe45c59c8d92e3ffdf6 (patch)
tree0122507f3c5ca236db3139fba231685297138f4a /tests/auto/declarative/qdeclarativelanguage/data
parent8968c79c575755cdb52d5e615ed19e4529047464 (diff)
parent9fc5c260858559662e156865e4666e5a91452cc2 (diff)
downloadQt-405ae4ef5382cd8ee0adfbe45c59c8d92e3ffdf6.zip
Qt-405ae4ef5382cd8ee0adfbe45c59c8d92e3ffdf6.tar.gz
Qt-405ae4ef5382cd8ee0adfbe45c59c8d92e3ffdf6.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (76 commits) Reseted QtDeclarative module def files Get WebView tests passing again Remove arbitrary width checks Removed compilation warning for systems with no OpenGL support Fix bug in SameGame's dialog component doc fix Add abstractitemmodel example, and fix some model docs docs - quote code with snippets, other improvements Fix webkit import for webkit tests. Remove qmlviewer dependency on QDeclarativeTimer Remove a few more unnecessary exports. Don't export declarative private classes Add additional text layout benchmarks. Don't access uninitialized value. Minor Twitter demo enhancements Added SET_BINDING message to QDeclarative debugger protocol Add ListView.nextSection attached property Remove the old font.outline documentation Docs - add more links to relevant examples Rewrite runtime & qmlviewer docs and emphasise that qmlviewer shouldn't ...
Diffstat (limited to 'tests/auto/declarative/qdeclarativelanguage/data')
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/invalidProperty.errors.txt1
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/invalidProperty.qml5
2 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidProperty.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/invalidProperty.errors.txt
new file mode 100644
index 0000000..c83e5ae
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidProperty.errors.txt
@@ -0,0 +1 @@
+4:5:Illegal property name
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidProperty.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidProperty.qml
new file mode 100644
index 0000000..6077de4
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidProperty.qml
@@ -0,0 +1,5 @@
+import Qt 4.7
+
+QtObject {
+ property int parseInt
+}