aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
Commit message (Collapse)AuthorAgeFilesLines
* Build against refactor.Samuel Rødal2011-07-299-9/+9
| | | | Change-Id: I0143767405afe968c0aea71651bd9e3dc7a74e23
* fix qmltest bugsCharles Yin2011-07-203-6/+50
| | | | | | | Change-Id: If814516b1094b85fba46e215b44e1a2b582179c5 Reviewed-on: http://codereview.qt.nokia.com/1858 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Charles Yin <charles.yin@nokia.com>
* make debug_and_release setting statement consistent with qt_module_configOswald Buddenhagen2011-07-201-1/+1
| | | | | | | Change-Id: I2e3e7a40e6bf8701715e7d7068ba7d47138e8d6c Reviewed-on: http://codereview.qt.nokia.com/1784 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fixed compile (for certain configurations)Rohan McGovern2011-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | This project tried to use libQtTest, but omitted `QT+=testlib'. In most configurations, this didn't matter, because: - for includes, QtQuickTest has copied the content of some QtTest headers, instead of #including them, so the bad INCLUDEPATH went unnoticed - for libraries, libQtTest would be pulled in implicitly either via .prl files or via the system's linker, so the bad LIBS went unnoticed Change-Id: Ie3286718789758bfb80f6832aac7c08bdd85212a Reviewed-on: http://codereview.qt.nokia.com/1812 Reviewed-by: Jonni Rainisto <jonni.rainisto@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Extract all QtQuick 1 elements into a separate library/plugin.Martin Jones2011-07-1212-8/+206
| | | | | | Change-Id: I41a280de2739ee08202f4be2519e5012870090f2 Reviewed-on: http://codereview.qt.nokia.com/1391 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Merge branch 'v8'Aaron Kennedy2011-07-084-67/+66
|\ | | | | | | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativescarceresourcescriptclass.cpp src/declarative/qml/qdeclarativescarceresourcescriptclass_p.h Change-Id: I54e579307cbeafbbad21884218c5e797ba245c8b
| * windowShown is a property of qtest, not util.Charles Yin2011-06-231-1/+1
| | | | | | | | Change-Id: I3d96b6bd43fc8fdfdf9a916032efd9a7360aafba
| * get the caller file & line number from v8 stack trace.Charles Yin2011-06-234-67/+66
| | | | | | | | Change-Id: I0ffebd2d22702bc14e1629b8bc0455a9cf8ea416
* | Update licenseheader text in source files for qtdeclarative Qt moduleJyri Tahtela2011-07-0820-340/+340
|/ | | | | | | | Replace old license header with correct one. Change-Id: I492ddaaa0227b2c8faf11bdcd6e12e7231a54a10 Reviewed-on: http://codereview.qt.nokia.com/1312 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Merge branch 'master' into qtquick2Aaron Kennedy2011-06-098-121/+121
|\ | | | | | | | | Conflicts: src/declarative/qml/qdeclarativeengine.cpp
| * Use feature profile loading instead of direct inclusion.axis2011-06-071-2/+2
| |
| * Merge branch 'qtquick2'Martin Jones2011-05-31137-85/+18442
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Update licenseheader text in source files for qtdeclarative Qt moduleJyri Tahtela2011-05-248-136/+136
| | | | | | | | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | | Immense Particles Refactor Part AAlan Alpert2011-06-07106-14414/+21
| |/ |/| | | | | | | | | | | Qt.labs.particles 2.0 moved to QtQuick.Particles 2.0. All C++ classes changed names, some renaming of QML types. Also adds CustomParticle.
* | fix shadow build errorCharles Yin2011-05-301-0/+4
| | | | | | | | Change-Id: I68c8edac98389c487c1ac09bb74d43fdeb85cdc3
* | Compile fix.Kim Motoyoshi Kalland2011-05-301-4/+0
| |
* | copy other .qml .js files during build timeCharles Yin2011-05-301-4/+21
| | | | | | | | Change-Id: I08db54c7cd5d2ae7bbad28440cc36f6332a190c9
* | Multi-line sprite files will now workAlan Alpert2011-05-268-45/+195
| |
* | Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging ↵Gunnar Sletta2011-05-232-4/+0
|\ \ | | | | | | | | | into qtquick2
| * \ Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging ↵Alan Alpert2011-05-232-10/+55
| |\ \ | | | | | | | | | | | | into qtquick2
| * | | Compile on MacAlan Alpert2011-05-232-4/+0
| | | |
* | | | Don't store texture references after the view has gone awayGunnar Sletta2011-05-231-3/+1
| |/ / |/| | | | | | | | | | | | | | | | | | | | This is a partial fix only. We will eventually need to get proper sharing of resources across multiple GL contexts, but this fixes the autotest and will work for most usecases. The task QTBUG-19455 has been created to solve it properly.
* | | Ensure that showDirs is respected in FolderListModelChris Adams2011-05-232-10/+55
|/ / | | | | | | | | | | | | | | | | | | | | | | Calling index() on a QDirModel can modify the filters applied. This patch to FolderListModel ensures that filtering is reset if required, so that programmatically selecting a subfolder in a folder does not cause that subfolder to become visible if showDirs is set to false. Task-number: QTBUG-17837 Reviewed-by: Martin Jones Change-Id: I449321d5170ecedf2a0cb36483d50020305a26dd
* | Remove ModelParticleAlan Alpert2011-05-234-462/+4
| | | | | | | | Nothing is using it anymore, lets keep it that way.
* | Split up ModelParticleAlan Alpert2011-05-239-3/+766
| | | | | | | | | | | | 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.
* | Fixed switching between particle performance modesAlan Alpert2011-05-232-210/+262
| | | | | | | | Actually switches shaders, and does not lose emitted particle data.
* | Integrate QtQuickTest into QtCharles Yin2011-05-2011-0/+1985
| | | | | | | | | | Change-Id: I558821c0dec9166ea1d0d2e1e2f889553c436316 Task-number:QTBUG-16082
* | Add BurstEmitter, and a simple render path for UltraParticlesAlan Alpert2011-05-1910-64/+536
| | | | | | | | | | None of the intermediate paths are written though. It's all or virtually nothing.
* | Add UltraParticleAlan Alpert2011-05-1811-4/+2106
| | | | | | | | | | They're not as cool as they sound. Includes example, and the now pointless SuperParticle (for possible performance comparisions).
* | Fix emitter burst method bugsAlan Alpert2011-05-175-130/+139
| | | | | | | | | | | | Burst will now always burst at the x,y where it was called, and doesn't leave trails between close bursts. Kill affector also gets a fix for double killing things sometimes.
* | Upgrade Flickr demo to QtQuick 2.Alan Alpert2011-05-126-14/+49
| | | | | | | | | | | | | | And throw in particle effects. Includes a variety of fixes to modelparticle and picture affector which were arrived at during this demo.
* | Documentation and API cleanup of QSGMaterialGunnar Sletta2011-05-114-46/+46
| |
* | Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging ↵Alan Alpert2011-05-052-1/+3
|\ \ | | | | | | | | | into qtquick2
| * | Merge branch 'master' into qtquick2Gunnar Sletta2011-05-042-1/+3
| |\| | | | | | | | | | | | | Conflicts: src/imports/particles/particles.pro
| | * Use private headersMarius Storm-Olsen2011-05-022-2/+2
| | |
* | | Model Particle fixesAlan Alpert2011-05-053-17/+47
|/ / | | | | | | Now tracks model count changes.
* | Affector AugmentationAlan Alpert2011-05-036-10/+60
| | | | | | | | | | | | Affectors gained shape and signal properties, and the affected(x,y) signal (turned on by the signal property, a theorized performance improvement).
* | Update particles to use QElapsedTimerAlan Alpert2011-04-287-11/+10
| | | | | | | | | | | | | | | | Step one of fixing the limited lifetime bug. As this step should also increase the lifetime 'a lot' step two may take a while. Change-Id: I87bbe762803451f751e23d4bf8559c662fdf57a3 (cherry picked from commit 9cf15c135373f8190bf2cb62f9f99890cacf7d88)
* | Add variable rotation speed to deformable particleAlan Alpert2011-04-283-6/+45
| | | | | | | | | | Change-Id: I105f18f0d7ec860de5d8bc8a9f3e4f007ea71ae2 (cherry picked from commit 41296b3ed046ddf73eca320bf0a97008decca287)
* | Merged master into qtquick2.axis2011-04-274-6/+8
|\|
| * Switched to using QT.declaratice.imports variable.axis2011-04-274-4/+4
| |
| * compile qtdeclarative/importOlivier Goffart2011-04-271-2/+4
| |
* | Initial import from qtquick2.Qt by Nokia2011-04-27110-22/+13093
|/ | | | | Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
* Initial import from the monolithic Qt.Qt by Nokia2011-04-2717-0/+2921
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 17:28:27 +0000