summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2009-11-11 07:46:20 (GMT)
committerAlan Alpert <alan.alpert@nokia.com>2009-11-11 07:46:20 (GMT)
commit8e5166aba8c8d79e47d4c4fccd5acf52f9cffec6 (patch)
treef9b91b73e52ec389107cc8791ac76e87f962944b /examples
parent6ac7ce79b6041a7c35d08cb28f775dead9701c4b (diff)
parent0faef2ba318b7df095d5c20fdddd0933ae4912c3 (diff)
downloadQt-8e5166aba8c8d79e47d4c4fccd5acf52f9cffec6.zip
Qt-8e5166aba8c8d79e47d4c4fccd5acf52f9cffec6.tar.gz
Qt-8e5166aba8c8d79e47d4c4fccd5acf52f9cffec6.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts: src/declarative/util/util.pri
Diffstat (limited to 'examples')
-rw-r--r--examples/declarative/webview/newwindows.qml5
1 files changed, 3 insertions, 2 deletions
diff --git a/examples/declarative/webview/newwindows.qml b/examples/declarative/webview/newwindows.qml
index e2ed58f..5dd4cd5 100644
--- a/examples/declarative/webview/newwindows.qml
+++ b/examples/declarative/webview/newwindows.qml
@@ -5,9 +5,10 @@
import Qt 4.6
-Row {
+Grid {
+ columns: 3
id: pages
- height: 200; width: 500
+ height: 300; width: 600
Component {
id: webViewPage