summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-11-102-31/+33
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Fix samegame tutorial 3Alan Alpert2009-11-101-12/+12
| | | | | | | | | | the js file hadn't been updated to avoid global vars Also updating a missed particles element
| * Clarify the role of positioner transitionsAlan Alpert2009-11-101-19/+21
| | | | | | | | | | | | | | They are only for the positioner's position changes, other changes are under the designers control and the designer should animate them. Task-number: QT-2239
* | Remove WebView::pagewidth and tidy up - it's not needed and interferedWarwick Allison2009-11-101-2/+2
|/ | | | with zoomFactor.
* Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-11-092-5/+8
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Fix perspective in dynamic exampleAlan Alpert2009-11-092-5/+8
| | | | | | | | working Z and items can no longer be placed in the sky (due to scaling).
* | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2009-11-0929-77/+395
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/corelib/animation/qabstractanimation.cpp src/gui/graphicsview/qgraphicsview.cpp src/s60installs/s60installs.pro tools/configure/configureapp.cpp tools/qdoc3/node.h
| * Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-11-0610-33/+72
| |\ | | | | | | | | | | | | Conflicts: dist/changes-4.6.0
| | * Merge branch '4.6-s60' into 4.6axis2009-11-066-3/+27
| | |\
| | | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-11-052-15/+0
| | | |\
| | | * \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-11-0410-32/+28
| | | |\ \
| | | * | | Added UIDs to projects lacking themMiikka Heikkinen2009-11-046-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also added symbianpkgrules.pri include to some examples Reviewed-by: Janne Koskinen
| | * | | | Merge remote branch 'qt-official/4.6' into 4.6Morten Johan Sørvig2009-11-062-17/+25
| | |\ \ \ \
| | | * | | | Modify QGLShader and QGLShaderProgram in response to API reviewRhys Weatherley2009-11-052-17/+25
| | | | |_|/ | | | |/| | | | | | | | | | | | | | Reviewed-by: Sarah Smith
| | * | | | Fixed pinching in the imagegestures example.Denis Dzyubenko2009-11-051-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the gesture finishes it might not necessery set the ScaleFactorChanged flag. Also fixed the touch-event based pinch gesture. Reviewed-by: trustme
| | * | | | Small improvement in the imagegesture example.Denis Dzyubenko2009-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't actually need to fill the backgroup in the example as it will be done by Qt. And when double-clicked we need to reset the scale factor properly. Reviewed-by: trustme
| | * | | | Implemented QSwipeGesture recognizer using touch events.Denis Dzyubenko2009-11-051-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Bradley T. Hughes
| | * | | | Merge remote branch 'qt-official/4.6' into 4.6Morten Johan Sørvig2009-11-0511-41/+15
| | |\ \ \ \ | | | |/ / /
| | * | | | Mac: pinch gesture scales to fast and event below zeroRichard Moe Gustavsen2009-11-042-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the math correct. Plus, update the imagegesture example. Rev-By: denis
| * | | | | Pro file fixes wrt anchor layout examples.Jan-Arve Sæther2009-11-062-4/+3
| | | | | |
| * | | | | Make sure the pixmap is properly initialized.Jan-Arve Sæther2009-11-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: sroedal
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-widget-team into 4.6Jan-Arve Sæther2009-11-054-35/+16
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Eskil Abrahamsen Blomfeldt2009-11-047-29/+23
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Merge commit '51c9b68' into 4.6Morten Johan Sørvig2009-11-042-20/+16
| | | |\ \ \ | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.6.0 src/gui/kernel/qevent.h
| | | | * | Compile fix after the last gesture api changeDenis Dzyubenko2009-11-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | | * | Gesture api review.Denis Dzyubenko2009-11-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes to the gesture api after the review. Reviewed-by: Jasmin Blanchette
| | | | * | Implemented pinch gesture recognizer.Denis Dzyubenko2009-11-031-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | | * | Fixed the imagegestures project file.Denis Dzyubenko2009-11-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | * | | | Fixed hardcoded GL library names on WinCE.Trond Kjernåsen2009-11-042-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5148 Reviewed-by: Tom Cooksey
| * | | | | Merge branch 'fixes' of git://gitorious.org/~morphbr/qt/morphbrs-clone into ↵Jan-Arve Sæther2009-11-059-0/+300
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | morpheuz-fixes
| | * | | | Weather Anchor Layout exampleArtur Duque de Souza2009-11-059-0/+300
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a design that was not possible before with the other layouts. To do this, the developer would need to hardcode all the positions and resize would not work. Besides the fact that we use "pixmap widgets" no it's not totally usefull widgets, it shows how anchors can help developers an designers with to create applications with new layouts. Signed-off-by: Artur Duque de Souza <artur.souza@openbossa.org>
| * | | | QVideoFrame API review changes.Andrew den Exter2009-11-042-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename equivalentImageFormat() to imageFormatFromPixelFormat(). Rename equivalentPixelFormat() to pixelFormatFromImageFormat(). Rename numBytes() to mappedBytes(). Reviewed-by: Justin McPherson
| * | | | QAbstractVideoSurface API review changes.Andrew den Exter2009-11-044-6/+4
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename isStarted() and startedChanged() to is active() and activeChanged(). Remove the the similar format argument from isFormatSupported() and add a new nearestFormat() function which provides the same functionality. Reviewed-by: Justin McPherson
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-11-042-1/+3
| |\ \ \
| * \ \ \ Merge branch 'statemachine-api-changes' into 4.6Eskil Abrahamsen Blomfeldt2009-11-031-2/+2
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Conflicts: doc/src/frameworks-technologies/statemachine.qdoc src/corelib/statemachine/qstatemachine.cpp
| | * | | Rename QState::polished() signal to "propertiesAssigned"Eskil Abrahamsen Blomfeldt2009-11-031-2/+2
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Polished" was never a very descriptive word, and it already has a meaning attached in the QStyle API. Additionally, "propertiesAssigned" has the benefit of giving the relation to the assignProperty() function as part of the name. Reviewed-by: Kent Hansen
* | | | move examples/follow.qml to visuals/qmlspringfollow.qmlYann Bodson2009-11-064-73/+0
| | | |
* | | | Rename targets -> matchTargets and properties -> matchProperties.Michael Brasser2009-11-0622-52/+52
| | | |
* | | | fix javascript errors in samegame tutorialsYann Bodson2009-11-054-57/+102
| | | |
* | | | Use darker() and lighter() functions from global Qt object rather than from ↵Yann Bodson2009-11-0511-12/+12
| | | | | | | | | | | | | | | | SystemPalette.
* | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Yann Bodson2009-11-051-6/+7
|\ \ \ \ | | | | | | | | | | | | | | | into kinetic-declarativeui
| * \ \ \ Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-11-0521-28/+28
| |\ \ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | | Particles cleaned up and placed in in qmlgraphics/Alan Alpert2009-11-051-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API changes: Removed bool streamIn Added int emissionRate Added int emissionVariance Added void burst(count, emissionRate=-1) While rewriting the internals to accomodate this, all other outstanding particles bugs were believed fixed. Task-number: QT-2392 QT-2391 QT-2390 QT-2406
* | | | | | use FreeMono.ttfYann Bodson2009-11-053-2/+1
| |/ / / / |/| | | |
* | | | | Remove "to" limit on minor version.Warwick Allison2009-11-0521-28/+28
|/ / / / | | | | | | | | | | | | | | | | | | | | QML_DEFINE_TYPE etc. now define just the initial support version, with support in all future versions being thus implied. QTBUG-5421
* | | | Remove examples of removed effects.Warwick Allison2009-11-041-63/+12
| | | |
* | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-11-041-4/+1
|\ \ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | more autotestsYann Bodson2009-11-041-4/+1
| | | | |
* | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2009-11-043-15/+6
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/gui/graphicsview/qgraphicsitem_p.h
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6David Boddie2009-11-032-1/+3
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | Conflicts: src/gui/kernel/qevent.cpp src/network/ssl/qsslerror.cpp
generated by cgit v0.12 at 2025-01-20 07:43:47 (GMT)