diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-23 14:31:47 +0100 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-23 14:31:47 +0100 |
| commit | 0655209fdad022bd0f6eb20ce85522cb56506bf0 (patch) | |
| tree | cdba0c1590655f5cb75a68cedff74f8a683db3a2 /examples/tutorials/helloworld/tutorial1.qml | |
| parent | c3babc03c99c6ca5fa210486e133eb456a405bab (diff) | |
| parent | 3d8f103c2641f35e7681485102a1b59886db8934 (diff) | |
Merge master into api_changes
Conflicts:
src/qml/qml/qqmlboundsignal.cpp
src/qml/qml/qqmlpropertycache.cpp
Change-Id: I5193a193fa301c0b518291645bf626a5fa07118f
Diffstat (limited to 'examples/tutorials/helloworld/tutorial1.qml')
| -rw-r--r-- | examples/tutorials/helloworld/tutorial1.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/tutorials/helloworld/tutorial1.qml b/examples/tutorials/helloworld/tutorial1.qml index f0eb42d696..3de79831f4 100644 --- a/examples/tutorials/helloworld/tutorial1.qml +++ b/examples/tutorials/helloworld/tutorial1.qml @@ -46,7 +46,7 @@ import QtQuick 2.0 //![1] Rectangle { id: page - width: 500; height: 200 + width: 320; height: 480 color: "lightgray" //![1] |