summaryrefslogtreecommitdiffstats
path: root/demos
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2009-11-1911-49/+40
|\ | | | | | | | | | | | | kinetic-declarativeui Conflicts: src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
| * Removed Browser demo from Symbian buildsMiikka Heikkinen2009-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | Browser demo isn't currently compiling for Symbian GCCE builds because ARMV5 built static uitools.lib apparently isn't compatible with linking into GCCE application. Removed the browser from Symbian builds as a hotfix for 4.6.0. Task-number: QTBUG-5692 Reviewed-by: Janne Anttila (cherry picked from commit 31d29b227a7609ab0dadca4244cafec919264ba8)
| * Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-173-1/+23
| |\
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-162-1/+22
| | |\ | | | | | | | | | | | | 4.6-staging2
| | | * Merge commit 's60/4.6' into mmfphononFrans Englich2009-11-166-5/+16
| | | |\
| | | * \ Merge branch '4.6' into mmfphononFrans Englich2009-11-162-17/+19
| | | |\ \
| | | * | | Pause playback on small screens when popping up dialogs.Frans Englich2009-11-122-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only done for small screens. Patch simplified by Gareth. Task-number: QTBUG-5307 Reviewed-by: Gareth Stockwell
| | | * | | Mediaplayer now pauses playback before displaying error dialogGareth Stockwell2009-11-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change improves the user experience - previously, video playback would continue in the background, while the user read the dialog. Then, when the dialog was dismissed, video playback would pause. Reviewed-by: Frans Englich
| | * | | | Properly initialize all vars.Thomas Zander2009-11-161-0/+1
| | | |_|/ | | |/| | | | | | | | | | | | This fixes a valgrind warning.
| * | | | Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-134-3/+14
| |\ \ \ \ | | |/ / /
| | * | | Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-134-3/+14
| | |\ \ \
| | | * | | Fixes sub-attaq segfault when pausingLeonardo Sobral Cunha2009-11-102-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sub-attaq's animation manager was accessing a deleted animation. Task-number: QTBUG-5646 Reviewed-by: thierry
| | | * | | Fixes sub-attaq demo, unfreeze boat after launching new game when on pauseLeonardo Sobral Cunha2009-11-102-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5526 Reviewed-by: thierry
| * | | | | Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-121-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Doc: Fixed typo.David Boddie2009-11-091-1/+1
| | |/ / / | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | QUrl::fromUserInput: improvements, corrections and make the demoJocelyn Turcotte2009-11-122-43/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | browser use it. - Handle windows files names by looking for paths first (and don't check that it exists first) - Handle host names without dots (it was not handled because of difficulties with the case host:port) - Return the parsed url only if the host or the path is not empty instead of returning a url that looks like "http:" Reviewed-by: Thiago Macieira
* | | | Pass error messages through to WebView users.Warwick Allison2009-11-181-0/+2
| | | |
* | | | Fix URL update in demoWarwick Allison2009-11-181-1/+1
| | | | | | | | | | | | | | | | If you manually typed in a url in the qml webbrowser demo the browser stopped updating the url bar with the current page your are on.
* | | | Update examples for new SQL API.Warwick Allison2009-11-181-22/+10
| | | |
* | | | Partial fix for QTBUGT-5845Warwick Allison2009-11-171-7/+8
| | | |
* | | | Merge remote branch 'qt/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-11-111-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch '4.6-api-review' into 4.6Marius Storm-Olsen2009-11-091-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | API review: Rename functions numColors(), setNumColors() and numBytes()Marius Storm-Olsen2009-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QPaintDevice and QImage used the functions numColors(), setNumColors(), and numBytes(). However, this is not consistent with the rest of the Qt API which uses *Count() and set*Count(). Removed all usage of these functions inside Qt and test-cases. Reviewed-by: Andreas Aardal Hanssen
* | | | Fix minehunt demoAlan Alpert2009-11-114-2/+17
| | | |
* | | | Remove WebView::pagewidth and tidy up - it's not needed and interferedWarwick Allison2009-11-101-17/+26
| | | | | | | | | | | | | | | | with zoomFactor.
* | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2009-11-094-21/+23
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-062-17/+19
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.6.0
| | * \ \ Merge branch '4.6-s60' into 4.6axis2009-11-061-1/+1
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * Merge commit 's60/4.6' into mmfphononFrans Englich2009-11-042-3/+3
| | | |\
| | | * \ Merge branch '4.6' into mmfphononGareth Stockwell2009-11-0336-28985/+1446
| | | |\ \
| | | * | | Fix build caused by merge error.Frans Englich2009-10-231-1/+0
| | | | | |
| | | * | | Listen to hasVideoChanged() signal instead, such that we're more robust.Frans Englich2009-10-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This covers cases where the backend knows about video capability in a state other than the LoadingState. Patch by Adookkattil Saleem, slightly modified. Reviewed-by: Gareth Stockwell
| | * | | | Modify QGLShader and QGLShaderProgram in response to API reviewRhys Weatherley2009-11-051-16/+18
| | | |_|/ | | |/| | | | | | | | | | | | Reviewed-by: Sarah Smith
| * | | | Result API review with JasminThierry Bastian2009-11-041-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QAbstractAnimation: currentTime returns the "complete" current time currentLoopTime() returns the time inside the current loop add setPaused(bool) for consistency with QTimeLine stateChanged: newState passed as first paramater (before oldState) for consistency with the reset of Qt QAnimationGroup: rename clearAnimations to clear rename insertAnimationAt to insertAnimation rename takeAnimationAt to takeAnimation QSequentialAnimationGroup: rename insertPauseAt to insertPause
| * | | Incorporate API review feedback for math3d classes.Rhys Weatherley2009-11-042-3/+3
| | |/ | |/| | | | | | | Reviewed-by: Sarah Smith
* | | Rename targets -> matchTargets and properties -> matchProperties.Michael Brasser2009-11-0617-27/+27
| | |
* | | Update semantics of targets/properties and target/property.Michael Brasser2009-11-063-3/+3
| | | | | | | | | | | | | | | This is in preparation for renaming targets -> matchTargets and properties to matchProperties.
* | | fix calculatorYann Bodson2009-11-051-19/+15
| | |
* | | Use darker() and lighter() functions from global Qt object rather than from ↵Yann Bodson2009-11-054-4/+4
| | | | | | | | | | | | SystemPalette.
* | | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-11-051-1/+1
|\ \ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Remove "to" limit on minor version.Warwick Allison2009-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | QML_DEFINE_TYPE etc. now define just the initial support version, with support in all future versions being thus implied. QTBUG-5421
* | | | Particles cleaned up and placed in in qmlgraphics/Alan Alpert2009-11-052-11/+8
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2009-11-0436-28985/+1446
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/gui/graphicsview/qgraphicsitem_p.h
| * | Reducing file size.Alessandro Portale2009-10-301-0/+0
| | | | | | | | | | | | | | | | | | | | | Stripping 350k off by reencoding the mp3. 32 Kbps, mono, 22.05 KHz. Reviewed-by: trustme
| * | Reducing file sizes.Alessandro Portale2009-10-301-0/+0
| | | | | | | | | | | | | | | | | | Using pngout to make the fluidlauncher a bit lighter. Reviewed-by: trustme
| * | Reducing file sizes.Alessandro Portale2009-10-301-0/+0
| | | | | | | | | | | | | | | | | | Using pngout to make the fluidlauncher a bit lighter. Reviewed-by: trustme
| * | Reducing file sizes.Alessandro Portale2009-10-305-0/+0
| | | | | | | | | | | | | | | | | | Using pngout to make the fluidlauncher a bit lighter. Reviewed-by: trustme
| * | Reducing file sizes.Alessandro Portale2009-10-303-0/+0
| | | | | | | | | | | | | | | | | | | | | Using pngout to make the fluidlauncher a bit lighter. And to reduce Anomalies memory footprint. Reviewed-by: trustme
| * | Reducing file sizes.Alessandro Portale2009-10-3013-0/+0
| | | | | | | | | | | | | | | | | | Using pngout to make the fluidlauncher a bit lighter. Reviewed-by: trustme
| * | Reduced file sizes.Alessandro Portale2009-10-3012-28985/+1446
| |/ | | | | | | | | | | | | SVG graphics may contain much unneeded stuff. I used Inkscape's vacuum function and Ariya's svgmin. Much better now. Reviewed-By: trustme