summaryrefslogtreecommitdiffstats
path: root/demos
Commit message (Collapse)AuthorAgeFilesLines
* DocAaron Kennedy2009-10-131-0/+0
|
* Incorrect use of Script {}Aaron Kennedy2009-10-083-34/+31
|
* Rename label to labeltextAaron Kennedy2009-10-081-5/+5
| | | | Resolves scope collision between label property and label id
* Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-10-0768-1393/+876
|\ | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into test Conflicts: demos/declarative/samegame/content/samegame.js tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp
| * Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-10-0725-703/+193
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-10-0625-703/+193
| | |\ | | | | | | | | | | | | kinetic-declarativeui
| | | * Removed ICON for apps and demos except fluidlauncher and desktopservicesEspen Riskedal2009-10-062-29/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mifconv can't always handle absolute paths to the .svg specified, so for now we don't use absolute paths, and fix it later. Task-number: QTBUG-4693 Reviewed-by: Shane Kearns
| | | * Only build demo-browser 32-bit if Qt was actually built 32-bitTor Arne Vestbø2009-10-061-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | Also, add same trick for PPC Reviewed-by: MortenS
| | | * Build the demo-browser 32-bit on Mac since there's no 64-bit FlashTor Arne Vestbø2009-10-061-0/+4
| | | | | | | | | | | | | | | | Reviewed-by: Simon Hausmann
| | | * Simplification and use of QGraphicsObject in sub-attas demoThierry Bastian2009-10-0522-674/+181
| | | | | | | | | | | | | | | | Reviewed-by: alexis
| * | | Refactor tileSize to the gameCanvas itemAlan Alpert2009-10-072-13/+13
| | | |
| * | | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-10-0632-623/+613
| |\ \ \ | | |/ / | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | lowercase idsYann Bodson2009-10-0611-201/+202
| | | |
| | * | Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-10-061-2/+2
| | |\ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | Fix following API changes.Bea Lam2009-10-061-2/+2
| | | | |
| | * | | lowercase idsYann Bodson2009-10-0620-420/+409
| | |/ /
| * | | Consistent Commenting in SamegameAlan Alpert2009-10-051-0/+1
| |/ /
| * | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-10-0510-50/+50
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | Change .sci syntax to match BorderImage.Yann Bodson2009-10-0510-50/+50
| | | |
| * | | Minor fixes to flickr example.Michael Brasser2009-10-051-4/+6
| |/ /
* | | Reenable types/enums and move scripts into an isolated scopeAaron Kennedy2009-10-052-2/+7
| | |
* | | Prevent writes to the global objectAaron Kennedy2009-10-051-14/+14
| | | | | | | | | | | | Also add toString() method to qobjects
* | | Improve script lookup cachingAaron Kennedy2009-10-051-0/+3
|/ /
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-10-0430-44/+316
|\ \ | |/ | | | | | | | | | | kinetic-declarativeui Conflicts: configure
| * Enable multitouch on the Gradients demoBenjamin Poulain2009-10-021-1/+3
| | | | | | | | | | Reviewed-by: Denis Dzyubenko Reviewed-by: Pierre Rossi
| * Enable multitouch on the affine demoBenjamin Poulain2009-10-021-1/+3
| | | | | | | | | | Reviewed-by: Denis Dzyubenko Reviewed-by: Pierre Rossi
| * Add multitouch to the PathStroke demoBenjamin Poulain2009-10-023-5/+97
| | | | | | | | | | | | | | | | Add multitouch to the position of the path, and enable multitouch on the controls of the demo. Reviewed-by: Denis Dzyubenko Reviewed-by: Pierre Rossi
| * Add multitouch capabilities to the shared classes of the demoBenjamin Poulain2009-10-023-1/+104
| | | | | | | | | | | | | | | | | | | | Add multitouch feature to the HoverPoints and the ArthurWidget. Multitouch is enabled by default for widgets using HoverPoints. The ArthurWidget propagate the TouchEvents in order to have them handled by a parent if a parent accept the touch events. Reviewed-by: Denis Dzyubenko Reviewed-by: Pierre Rossi
| * Merge commit 'origin/4.6' into mmfphononFrans Englich2009-10-0217-19/+49
| |\ | | | | | | | | | | | | Conflicts: demos/mediaplayer/mediaplayer.pro
| | * Demos and applications have a nice Qt logo when installed on SymbianEspen Riskedal2009-10-0217-19/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a line to the symbianpkgrules.pri files which includes an ICON if the TARGET.UID3 is defined. We should fix the application_icon.prf to handle ICON without UID3 situations more gracefully, but for now I reordered existing UID3s to be specified before the symbianpkgrules.pri includes. Reviewed-by: Aleksandar Babic
| * | Update screenshot to not be the Linux version; the emulator is better.Frans Englich2009-10-021-0/+0
| | |
| * | Adjust the location that we install into, and use the sound location.Frans Englich2009-10-023-2/+4
| | | | | | | | | | | | | | | Note that fluidlauncher, because of desktopservices, installs the same mp3 to the same location.
| * | Use storage location MoviesLocation instead of app folder.Frans Englich2009-10-021-1/+2
| | |
| * | Install the sax.mp3 test file.Frans Englich2009-10-021-1/+5
| | |
| * | Ensure we can handle file names on the cmdline too.Frans Englich2009-10-021-3/+11
| | |
| * | Phonon MMF Backend: mediaplayer should be fullscreen.Frans Englich2009-10-024-13/+41
| |/ | | | | | | | | Task-number: QTBUG-4665 Reviewed-by: Gareth Stockwell
| * Added support for -small-screen argument for Context2d exampleMiikka Heikkinen2009-10-021-1/+1
| | | | | | | | | | | | | | | | To improve screen real-estate utilization in small screen devices, added -small-screen command line argument to the Context2d application. Task-number: QTBUG-3296 Reviewed-by: Janne Koskinen
* | Merge commit 'qt-mainline/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-10-0210-8/+25
|\ \ | |/ | | | | | | Conflicts: configure.exe
| * Merge commit 'origin/4.6' into mmfphononFrans Englich2009-09-304-5/+9
| |\
| | * Install sub-attaq in the correct place.Alexis Menard2009-09-301-2/+2
| | | | | | | | | | | | Reviewed-by:TrustMe
| | * Fix the sub-attaq menu (new game and quit).Alexis Menard2009-09-301-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Now QStateMachine can be a child of a QState but here in sub-attaq the code was not design for that so the code breaks. Task-number:QT-665 Task-number:QT-914 Reviewed-by:TrustMe
| | * Fix compile of anomaly for S60 3.1 SDKEspen Riskedal2009-09-291-1/+1
| | | | | | | | | | | | | | | | | | It seems that for 3.1 we need to explicitly link with insock.dll as well Reviewed-by: Aleksandar Babic
| | * The text fit now in the screen.Alexis Menard2009-09-291-1/+1
| | | | | | | | | | | | | | | Task-number:QT-739 Reviewed-by:TrustMe
| * | Install the qmediaplayer.exe too.Frans Englich2009-09-301-0/+1
| |/
| * Merge commit 'qt/4.6' into mmfphononFrans Englich2009-09-2911-26/+144
| |\
| | * Fix spelling error in the demo browser close-multiple-tabs dialogTor Arne Vestbø2009-09-291-1/+1
| | |
| | * Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Miikka Heikkinen2009-09-292-6/+6
| | |\
| | * | Fixed: Fluidlauncher doesn't react to keys.Miikka Heikkinen2009-09-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some recent changes had made Fluidlauncher unresponsive to keyboard input. It appears none of the Fluidlauncher widgets got keyboard focus by default, so set the focus explicitly to proper widget. Task-number: QT-2214 Reviewed-by: Alessandro Portale
| * | | Revert "Modified MediaPlayer to set names on its child QObject instances"Frans Englich2009-09-241-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ea6b181df68a18044a06063ab33dc6eb35b2aba1. We revert it because although it's useful for us developers when debugging, it's intended for customers, to demonstrate how to use Qt code. Conflicts: demos/mediaplayer/mediaplayer.cpp
| * | | Merge commit 'qt/4.6' into mmfphononFrans Englich2009-09-23342-4123/+37327
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/embedded/fluidlauncher/config_s60/config.xml demos/embedded/fluidlauncher/fluidlauncher.pro src/corelib/io/io.pri src/gui/kernel/qapplication_s60.cpp src/gui/kernel/qwidget_s60.cpp src/s60installs/qt_libs.pro