diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-04-12 07:38:46 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-04-12 07:38:46 (GMT) |
| commit | ee958684bd1273a5140e1f6d1264bf8bb7d62ef1 (patch) | |
| tree | c3b95bb906483b14dd9a58098b18b82b9d9010c2 /tests/auto/declarative/qdeclarativetextinput/data | |
| parent | efc80209fb5e6ac9d0343b3c9f6d5a1548cf5556 (diff) | |
| parent | 9753f6098e0e5b3d80ac748559aecc2e66dcfc7a (diff) | |
| download | Qt-ee958684bd1273a5140e1f6d1264bf8bb7d62ef1.zip Qt-ee958684bd1273a5140e1f6d1264bf8bb7d62ef1.tar.gz Qt-ee958684bd1273a5140e1f6d1264bf8bb7d62ef1.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Conflicts:
src/declarative/graphicsitems/qdeclarativetextinput.cpp
src/declarative/graphicsitems/qdeclarativetextinput_p.h
Diffstat (limited to 'tests/auto/declarative/qdeclarativetextinput/data')
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/declarative/qdeclarativetextinput/data/navigation.qml b/tests/auto/declarative/qdeclarativetextinput/data/navigation.qml index 493db5b..04f06da 100644 --- a/tests/auto/declarative/qdeclarativetextinput/data/navigation.qml +++ b/tests/auto/declarative/qdeclarativetextinput/data/navigation.qml @@ -1,7 +1,7 @@ import Qt 4.6 Rectangle { - property var myInput: input + property variant myInput: input width: 800; height: 600; color: "blue" diff --git a/tests/auto/declarative/qdeclarativetextinput/data/readOnly.qml b/tests/auto/declarative/qdeclarativetextinput/data/readOnly.qml index c47371a..41e8b59 100644 --- a/tests/auto/declarative/qdeclarativetextinput/data/readOnly.qml +++ b/tests/auto/declarative/qdeclarativetextinput/data/readOnly.qml @@ -1,7 +1,7 @@ import Qt 4.6 Rectangle { - property var myInput: input + property variant myInput: input width: 800; height: 600; color: "blue" diff --git a/tests/auto/declarative/qdeclarativetextinput/data/validators.qml b/tests/auto/declarative/qdeclarativetextinput/data/validators.qml index 531a232..4b1ba27 100644 --- a/tests/auto/declarative/qdeclarativetextinput/data/validators.qml +++ b/tests/auto/declarative/qdeclarativetextinput/data/validators.qml @@ -1,9 +1,9 @@ import Qt 4.7 Item { - property var intInput: intInput - property var dblInput: dblInput - property var strInput: strInput + property variant intInput: intInput + property variant dblInput: dblInput + property variant strInput: strInput width: 800; height: 600; |