Merge branch 'qtquick2'

Conflicts: demos/declarative/flickr/common/Progress.qml demos/declarative/flickr/common/RssModel.qml demos/declarative/flickr/common/ScrollBar.qml demos/declarative/flickr/common/Slider.qml demos/declarative/flickr/mobile/Button.qml demos/declarative/flickr/mobile/GridDelegate.qml demos/declarative/flickr/mobile/ImageDetails.qml demos/declarative/flickr/mobile/ListDelegate.qml demos/declarative/flickr/mobile/TitleBar.qml demos/declarative/flickr/mobile/ToolBar.qml demos/declarative/webbrowser/content/Button.qml demos/declarative/webbrowser/content/FlickableWebView.qml demos/declarative/webbrowser/content/Header.qml demos/declarative/webbrowser/content/ScrollBar.qml demos/declarative/webbrowser/content/UrlInput.qml demos/declarative/webbrowser/webbrowser.qml doc/src/snippets/declarative/mousearea/mousearea-snippet.qml examples/declarative/modelviews/webview/newwindows/qml/alerts.html examples/declarative/modelviews/webview/newwindows/qml/content/Mapping/map.html examples/declarative/modelviews/webview/newwindows/qml/content/pics/cancel.png examples/declarative/modelviews/webview/newwindows/qml/content/pics/ok.png examples/declarative/modelviews/webview/newwindows/qml/newwindows.html src/declarative/graphicsitems/qdeclarativetextinput.cpp src/declarative/qml/qdeclarativecompiledbindings.cpp src/declarative/qml/qdeclarativecompiledbindings_p.h src/declarative/qml/qdeclarativedom.cpp src/declarative/qml/qdeclarativedom_p.h src/declarative/qml/qdeclarativedom_p_p.h src/declarative/qml/qdeclarativeengine.cpp src/declarative/qml/qdeclarativetypeloader.cpp src/imports/particles/particles.cpp tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.4.png tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.6.png tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/usingRepeater.0.png tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.0.png tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.1.png tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.2.png tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.3.png tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.4.png tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.5.png tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.6.png tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.7.png tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-X11/multilineAlign.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-X11/parentanchor.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.1.png tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.1.png tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.1.png tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.1.png tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.1.png tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.2.png tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.3.png tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.4.png tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.5.png tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext2.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext3.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext2.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext2.0.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.0.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.1.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.10.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.11.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.2.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.3.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.4.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.5.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.6.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.7.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.8.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.9.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.0.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.1.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.2.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.3.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.4.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.5.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.6.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.0.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.1.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.2.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.3.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.4.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.10.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.11.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.12.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.7.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.9.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.7.png tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.0.png tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.1.png tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.2.png tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.11.png tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp Change-Id: I40df8a9403a58a6c03a0f1734f16a5cbed6c85ff
author: Martin Jones <martin.jones@nokia.com> 2011-05-31 15:25:44 +1000
committer: Martin Jones <martin.jones@nokia.com> 2011-05-31 15:25:44 +1000
commit: 766521d62a4cf4598326a510186b080a91bde6dd (patch)
tree: 5cf89c1338f42122c370c649b73c8193ca079268 /tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.qml
parent: a91b8a041966f8aea4bf01fdcb1d5006547f3902 (diff)
parent: e7fef9d6115d1a9193c112d8fd4249ae9396dae3 (diff)
1 files changed, 0 insertions, 279 deletions
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.qml
deleted file mode 100644
index f306f5c5b3..0000000000
--- a/tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.qml
+++ /dev/null
@@ -1,279 +0,0 @@
-import Qt.VisualTest 4.7
-
-VisualTest {
-    Frame {
-        msec: 0
-    }
-    Frame {
-        msec: 16
-        image: "elide.0.png"
-    }
-    Frame {
-        msec: 32
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 48
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 64
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 80
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 96
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 112
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 128
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 144
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 160
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 176
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 192
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 208
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 224
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 240
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 256
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 272
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 288
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 304
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 320
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 336
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 352
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 368
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 384
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 400
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 416
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 432
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 448
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 464
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 480
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 496
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 512
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 528
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 544
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 560
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 576
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 592
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 608
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 624
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 640
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 656
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 672
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 688
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 704
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 720
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 736
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 752
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 768
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 784
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 800
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 816
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 832
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 848
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 864
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 880
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 896
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 912
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 928
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 944
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 960
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 976
-        image: "elide.1.png"
-    }
-    Key {
-        type: 6
-        key: 16777249
-        modifiers: 0
-        text: ""
-        autorep: false
-        count: 1
-    }
-    Frame {
-        msec: 992
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 1008
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 1024
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 1040
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-    Frame {
-        msec: 1056
-        hash: "a2003f5b238564e9b68b38db156431d2"
-    }
-}
author	Martin Jones <martin.jones@nokia.com>	2011-05-31 15:25:44 +1000
committer	Martin Jones <martin.jones@nokia.com>	2011-05-31 15:25:44 +1000
commit	766521d62a4cf4598326a510186b080a91bde6dd (patch)
tree	5cf89c1338f42122c370c649b73c8193ca079268 /tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.qml
parent	a91b8a041966f8aea4bf01fdcb1d5006547f3902 (diff)
parent	e7fef9d6115d1a9193c112d8fd4249ae9396dae3 (diff)