summaryrefslogtreecommitdiffstats
path: root/demos
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6'Thiago Macieira2009-12-023-261/+345
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/gui/dialogs/qfiledialog_win.cpp src/plugins/qpluginbase.pri src/qbase.pri tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| * Adjust qmediaplayer's settings dialog for small screens.Frans Englich2009-11-251-160/+191
| | | | | | | | | | | | | | | | Patch done jointly by me and Jan-arve. Task-number: QTBUG-4725 Reviewed-by: Jan-Arve Sæther Reviewed-by: Frans Englich
| * Merge commit 's60/4.6' into mmfphononFrans Englich2009-11-231-0/+1
| |\
| * \ Merge branch '4.6' into mmfphononFrans Englich2009-11-2031-228/+260
| |\ \ | | | | | | | | | | | | | | | | Conflicts: demos/qmediaplayer/mediaplayer.cpp
| * | | Added additional keyboard shortcuts to MediaPlayerGareth Stockwell2009-11-191-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These shortcuts are used for pausing video playback while in full-screen mode, and for exiting full-screen mode. They are for non-QWERTY mobile devices, which lack keys mapping to the previously existing shortcut keycodes. Reviewed-by: Frans Englich
| * | | Added 'fullscreen video' menu option to media playerGareth Stockwell2009-11-192-90/+128
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5586 Reviewed-by: Frans Englich
| * | | Mediaplayer: do not exit full-screen when pausedGareth Stockwell2009-11-191-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This modifies the patch which introduced "exit full screen when end of playback is reached": f9d36789 Reviewed-by: Frans Englich
| * | | qmediaplayer: pausing behavior for dialog inconvenient.Frans Englich2009-11-162-12/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qmediaplayer when popping up dialogs shouldn't: * play when it's paused * pause when playing only audio Task-number: QTBUG-5851 Reviewed-by: Gareth Stockwell
* | | | Merge branch '4.6'Thiago Macieira2009-11-2532-231/+285
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/modules.qdoc examples/assistant/simpletextviewer/findfiledialog.cpp examples/webkit/fancybrowser/mainwindow.cpp src/gui/widgets/qtabbar.cpp src/gui/widgets/qtabbar_p.h tests/auto/qpixmap/tst_qpixmap.cpp tools/assistant/compat/helpdialog.cpp tools/assistant/compat/tabbedbrowser.cpp translations/translations.pri
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-233-0/+51
| |\ \ \ | | | |/ | | |/| | | | | 4.6-staging2
| | * | Add support for opening Real Media RAM files.Frans Englich2009-11-202-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Requested by Nokia Dallas/Helix team. Patch supplied by Fu Liz EXT-DextraTech/Dallas, minor changes by me. Task-number: QTBUG-4882 Reviewed-by: Gareth Stockwell
| | * | Symbian: Add capability NetworkServices.Frans Englich2009-11-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | From discussions with Helix team. Reviewed-by: Gareth Stockwell
| * | | Merge commit 'd9fa92' into origin-4.6Olivier Goffart2009-11-202-9/+35
| |\ \ \ | | |/ /
| | * | Enabled Qt icon in Symbian also for demos/examples without UID3.Janne Anttila2009-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ICON keyword can be used without UID, since .mif filename is generated based on target instead of UID3 nowadays Task-number: QTBUG-4677 Reviewed-by: Miikka Heikkinen
| | * | Added default Qt icon back for Qt demos/examples in Symbian.Janne Anttila2009-11-192-9/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit basically reverts fa35247d31bd35d72c307f4a6a231400aade0c0. It can be reverted now since mifconv invoking is changed to use relative paths instead of absolute one. Task-number: QTBUG-4745 Reviewed-by: TrustMe
| * | | Simply adds the Frozen Column example to qtDemoPierre Rossi2009-11-191-0/+1
| |/ / | | | | | | | | | Reviewed-by: TrustMe
| * | Ran the script utils/normalizeOlivier Goffart2009-11-1822-173/+173
| | | | | | | | | | | | Over src/ tools/ examples/ and demos/
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-181-1/+1
| |\ \ | | | | | | | | | | | | 4.6-staging2
| | * | 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
| * | | Merge upstream/4.6 into oslo-staging-2Olivier Goffart2009-11-172-43/+1
| |\ \ \ | | |/ / | |/| |
| | * | Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-173-1/+23
| | |\ \
| | * \ \ Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-134-3/+14
| | |\ \ \
| | * \ \ \ Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-121-1/+1
| | |\ \ \ \
| | * | | | | 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
| * | | | | | Removed drilldown from fluidlauncher demo.axis2009-11-173-4/+0
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It has too many problems at the moment, like taking up too much space and not being able to close the popup window. RevBy: Alessandro Portale
| * | | | | 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.
* | | | | | Remove mingw specific ifdefs after upgrade to mingw-gcc 4.4Thierry Bastian2009-11-171-2/+0
|/ / / / /
* | | | | 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
* | | | Doc: Fixed typo.David Boddie2009-11-091-1/+1
|/ / / | | | | | | | | | Reviewed-by: Trust Me
* | | 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
* | | 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
* | 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
generated by cgit v0.12 at 2025-02-06 10:32:06 (GMT)