diff options
| author | axis <qt-info@nokia.com> | 2010-03-11 09:15:55 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-03-11 09:42:47 (GMT) |
| commit | a375537d32bc33ba1154ec132f99f5a779bce067 (patch) | |
| tree | 3c23e3b2c44fb52d7d62036fe7dd793e589841e8 /doc/src/snippets/declarative/GroupBox.qml | |
| parent | 02f6da62a42bd1059eb0da091d1f46efbb919750 (diff) | |
| parent | 1e9552f826c05bf9884fb2893dedca265ead363b (diff) | |
| download | Qt-a375537d32bc33ba1154ec132f99f5a779bce067.zip Qt-a375537d32bc33ba1154ec132f99f5a779bce067.tar.gz Qt-a375537d32bc33ba1154ec132f99f5a779bce067.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public
Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/generators/makefile.h
qmake/project.cpp
src/3rdparty/webkit/WebCore/WebCore.pro
src/src.pro
Diffstat (limited to 'doc/src/snippets/declarative/GroupBox.qml')
| -rw-r--r-- | doc/src/snippets/declarative/GroupBox.qml | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/doc/src/snippets/declarative/GroupBox.qml b/doc/src/snippets/declarative/GroupBox.qml deleted file mode 100644 index 6c5431e..0000000 --- a/doc/src/snippets/declarative/GroupBox.qml +++ /dev/null @@ -1,15 +0,0 @@ -import Qt 4.6 - -ContentWrapper { - id: container; width: parent.width; height: contents.height - children: [ - Rectangle { - width: parent.width; height: contents.height - color: "white"; pen.width: 2; pen.color: "#adaeb0"; radius: 10 - Column { - id: layout; width: parent.width; margin: 5; spacing: 2 - Content { } - } - } - ] -} |