1f88f2ceed
Immense Particles Refactor Part C
...
Demos work again (also, the examples I missed).
Added an example launcher for particles.
2011-06-08 13:28:21 +10:00
8aefa88efc
Fix usage of QT_SOURCE_TREE
...
Functionality has been moved into qt_example.prf
2011-06-07 13:26:39 -05:00
984f21f18d
Immense Particles Refactor Part B
...
Examples work again. Also augmented Wander and PointAttractor with
physics modes.
2011-06-07 19:43:41 +10:00
fbfb27a44a
Remove more webkit dependency from qtdeclarative.
...
Change-Id: I75fd903e6a8160210652c2cec3c4636e908a9ade
2011-05-31 18:05:10 +10:00
66763c8efb
Remove the examples/declarative/demos copy.
...
Not sure why it is here, but it shouldn't be.
Change-Id: I1a2f9cc994de13690bbc77d41005051e340291f7
2011-05-31 16:42:49 +10:00
56d34a653a
Remove webbrowser demo from qtdeclarative module.
...
qtdeclarative should not depend on webkit.
Change-Id: I82e3f49dbe710e408c1a74911787541a9ea9efa1
2011-05-31 16:15:30 +10:00
766521d62a
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
2011-05-31 15:25:44 +10:00
f8f380ab06
Update TextBallons .pro file
...
Botched the previous alteration
2011-05-30 10:46:31 +10:00
4e7e10c403
Make textballon example follow convention
...
Currently, the qml examples autotest works on a set of conventions
defined in its source code to determine which tests to run.
2011-05-27 14:13:49 +10:00
10832f9746
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
2011-05-27 13:41:38 +10:00
e8b4767aea
Update image stream example
...
ModelParticle has died.
2011-05-27 13:41:13 +10:00
4e3e4f23c0
Remove webkit dependencies from qtdeclarative.
...
The webkit examples and demo should be added to webkit repo.
See https://bugs.webkit.org/show_bug.cgi?id=61596
Change-Id: Iffb2c5eb7f95a9bb563ad61c6002274cec54cd24
2011-05-27 13:00:47 +10:00
f0c87d3a1f
Update licenseheader text in source files for qtdeclarative Qt module
...
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
2011-05-24 14:43:28 +03:00
f766a992b1
Doc: Added missing project and desktop files.
2011-05-23 14:27:59 +02:00
6146287cb3
Squashed commit of changes from the 4.8-temp branch.
2011-05-23 14:27:59 +02:00
36dfaf4bb3
Squashed commit of the changes from the mobile-examples repository
...
(4.7-generated-declarative branch).
(cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
2011-05-23 14:27:58 +02:00
08fe14ab41
Fix QtDeclarative keyinteraction example
...
Task-number: QTBUG-19033
(cherry picked from commit 00a72cd1f5aff15d5a3a59d61efd2f5653d7dd34)
2011-05-23 15:22:55 +10:00
52d1ff7d3f
Split up ModelParticle
...
Now has DataParticle (with model and delegate) and an ItemParticle
(which you just feed items manually). ModelParticle left for now for
damage control - it will probably just disappear someday.
2011-05-23 15:16:00 +10:00
daf671b422
Integrate QtQuickTest into Qt
...
Change-Id: I558821c0dec9166ea1d0d2e1e2f889553c436316
Task-number:QTBUG-16082
2011-05-20 12:07:23 +10:00
defb7bc3e4
Fix typo.
2011-05-19 16:08:24 +02:00
c35f95c646
Add .pro file to fix build.
...
Reviewed-by: Kevin Wright
2011-05-19 14:49:30 +02:00
fafbc9f51b
Add TextBalloon QML Scene Grpah example with documentation. I moved an old example over to a subfolder.
...
Reviewed-by: Gunnar Sletta
2011-05-19 11:27:26 +02:00
1edb32e75d
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
2011-05-18 21:11:51 +10:00
b8338a1881
Add UltraParticle
...
They're not as cool as they sound. Includes example, and the now
pointless SuperParticle (for possible performance comparisions).
2011-05-18 21:10:00 +10:00
2e68186a80
show initial chart in motion chart example
...
Change-Id: I39297ced1c532f633a7c9c6c64c0818bbc852084
2011-05-18 13:46:16 +10:00
8df66dbeb5
fix motion chart example bug
...
Change-Id: I0d00d224d815210c8ef45f2289e9ec4d0adea6b5
2011-05-18 13:32:13 +10:00
d90a4c05c3
add motion chart canvas example
...
Change-Id: Iccce2c4fc2bdeb4289093fa9675440eff589ae41
2011-05-18 12:04:26 +10:00
9e037dae27
Fixes crash in PaintedItem example when using threaded rendering.
2011-05-11 15:55:01 +02:00
9267a7bce7
Added antialiasing property to QSGPaintedItem.
2011-05-03 14:41:52 +02:00
94c1a9d0e1
Affector Augmentation
...
Affectors gained shape and signal properties, and the affected(x,y)
signal (turned on by the signal property, a theorized performance
improvement).
2011-05-03 10:24:30 +10:00
40b6a270a1
Merged master into qtquick2.
2011-04-27 14:41:06 +02:00
a129444bb0
Initial import from qtquick2.
...
Branched from the monolithic repo, Qt qtquick2 branch, at commit
a4a585d2ee907746682846ae6e8a48e19deef469
2011-04-27 14:40:44 +02:00
885735d011
Initial import from the monolithic Qt.
...
This is the beginning of revision history for this module. If you
want to look at revision history older than this, please refer to the
Qt Git wiki for how to use Git history grafting. At the time of
writing, this wiki is located here:
http://qt.gitorious.org/qt/pages/GitIntroductionWithQt
If you have already performed the grafting and you don't see any
history beyond this commit, try running "git log" with the "--follow"
argument.
Branched from the monolithic repo, Qt master branch, at commit
896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 12:05:43 +02:00
715b0251af
Moved to using a feature profile instead of direct inclusion.
2011-04-27 12:05:43 +02:00
Alan Alpert
Marius Storm-Olsen
Martin Jones
Jyri Tahtela
David Boddie
Yann Bodson
Charles Yin
Casper van Donderen
Yoann Lopes
axis