summaryrefslogtreecommitdiffstats
path: root/demos/declarative
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-0460-60/+60
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/snippets/code/doc_src_qmake-manual.qdoc src/corelib/arch/symbian/arch.pri src/declarative/graphicsitems/qdeclarativeflickable.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h tests/auto/qfontmetrics/tst_qfontmetrics.cpp
| * Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Aaron Kennedy2010-09-2960-60/+60
| | | | | | | | | | Task-number: QTBUG-13799 Reviewed-by: Martin Jones
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-1024-468/+395
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt demos/declarative/snake/content/snake.js demos/declarative/snake/snake.qml doc/src/development/qmake-manual.qdoc src/corelib/plugin/plugin.pri src/gui/kernel/qapplication_win.cpp src/gui/kernel/qdesktopwidget_win.cpp src/gui/painting/qdrawhelper.cpp tests/auto/qdir/tst_qdir.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf
| * Re-add quit button to declarative Twitter demoJoona Petrell2010-09-091-1/+12
| | | | | | | | | | Task-number: Reviewed-by: Bea Lam
| * Fix text size issues for high ppi displaysAlessandro Portale2010-09-075-7/+7
| | | | | | | | | | | | | | | | | | | | | | Many layout sizes in flickr are specified by the artwork sizes. The heights and widths are defined in static pixel sizes. Therefore the text has to obey the size restrictions, and should not overlap. This patch sets the font sizes in pixels. Otherwise the default font sizes in points may be too big on high ppi displays. (XM5800 has ~230 ppi)
| * Increase maximum heap size of minehunt demo to fix crashing on SymbianJoona Petrell2010-09-071-0/+1
| | | | | | | | | | Task-number: QT-3821 Reviewed-by: Martin Jones
| * Ensure slider is updated when screen size changes.Martin Jones2010-09-062-6/+38
| | | | | | | | Task-number: QT-3718
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-09-0217-464/+347
| |\
| | * Updated Twitter demo in response to the new Twitter oauth requirementJens Bache-Wiig2010-08-3113-459/+330
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Twitter is blocking access to the old authentification method that our demo was using. This breaks the demo completely. To fix this, I changed the demo into only make use of the public search API. You can no longer tweet but you can search for different tweets. At the moment making an oauth capable demo is not desirable due to the problems with handling a secret app token among other issues. Task-number: QTBUG-13181 Reviewed-by: Alan Alpert
| | * Revert "Add 'cached' property to Image."Yann Bodson2010-08-311-2/+2
| | | | | | | | | | | | | | | | | | This will have to go in 4.8. This reverts commit 3928cb20ecc63ed21cdb122388b200c9ab8e7cad.
| | * Add 'cached' property to Image.Yann Bodson2010-08-311-2/+2
| | | | | | | | | | | | | | | Task-number: QTBUG-7300 Reviewed-by: Aaron Kennedy
| | * Remove debug.Martin Jones2010-08-301-1/+0
| | |
| | * Snake: Don't use Behavior with states.Martin Jones2010-08-304-5/+18
| | | | | | | | | | | | | | | | | | | | | Changing states mid-animation confuses states where property value is not specified explicitly for each state. Task-number: QT-3823
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-08-2617-21/+93
| |\ \ | | |/
| * | Maintain high score name dialog length, as well as name.Alan Alpert2010-08-262-1/+3
| | | | | | | | | | | | Task-number: QTBUG-13129
* | | State handling cleanupmae2010-09-093-21/+50
| |/ |/| | | | | | | | | The game could end up in funky states when restarting while the startup animation was running. Also some smaller fixes for rotation.
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-08-2611-20/+92
|\ \
| * | Add quit buttons to declarative demosJoona Petrell2010-08-2611-20/+92
| |/ | | | | | | | | Task-number: QTBUG-13048 Reviewed-by: Martin Jones
* | Make declarative examples a bit more qt-like.Yann Bodson2010-08-267-1/+1
|/
* Fix minehunt demo for SymbianJoona Petrell2010-08-206-145/+215
| | | | | Task-number: QTBUG-8927 Reviewed-by: Alan Alpert
* Fix game could not be restartedmae2010-08-162-16/+5
| | | | Task-number: QT-3668
* Snake game cannot be restartedmae2010-08-031-2/+15
| | | | Task-id: QT-3668
* Fix photo positioning bug in flickr demo.Yann Bodson2010-08-033-87/+87
| | | | Task-number: QTBUG-3669
* Make it possible to manually set the orientation of QML Viewer on SymbianJoona Petrell2010-08-032-9/+9
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12142 Reviewed-by: Warwick Allison This patch brings ability to switch QML Viewer's orientation between auto-orientation (=follow sensor), portrait and landscape orientations (lock orientation) on Symbian. It provides same orientation options as Qt Creator 2.1's Qt QML Standalone Application creation wizard. Also, menu item rotateOrientation now works on Symbian, but it's hidden when orientation mode is set to auto-orientation. Property runtime.orientation has been switched back to supporting four-way orientation on Symbian, previously it only updated values between portrait and landscape. If your application only supports landscape or portrait modes, just don't react to the inverted orientations. Added orientation example screenorientation under examples/declarative. The patch includes a fix for calculator example, which rotated to wrong direction when switching from portrait to landscape. Also, improved qdeclarativeviewer unit tests. Changes have been tested to work on Windows, Linux and Symbian^3.
* Remove warnings in photoviewer demo.Yann Bodson2010-07-291-1/+1
| | | | Task-number: QTBUG-12494
* Uncomment code accidentally removed with ↵Aaron Kennedy2010-07-291-2/+0
| | | | | | 1937adaab5861ced44813c6a4b0bff1c3750ecd3 QTBUG-3620
* QML focus API updates.Michael Brasser2010-07-213-3/+3
| | | | | | | | | The wantsFocus property has been renamed to activeFocus, to better reflect its value. Reading and writing the focus property is also now consistent -- this property represents focus within a scope. Other small changes were made to keep things consistent with the new naming. Reviewed-by: Aaron Kennedy
* Fix SamegameAlan Alpert2010-07-191-2/+2
| | | | | | | Change to Behavior from Follow means that some of the previous assumptions are now incorrect. Script logic has been fixed. Task-number: QTBUG-12246
* Enter key performs same action as Return key in QML demos.Martin Jones2010-07-145-0/+9
| | | | N900 has an Enter key, not a return key
* Follow -> Behaviormae2010-07-082-8/+10
| | | | Replace the usages of Follows with Behaviors, update docs.
* Add Symbian support for runtime.orientation propertyJoona Petrell2010-07-072-9/+22
| | | | | Task-number: Reviewed-by: Martin Jones
* Fixed deployment locations for various profiles.axis2010-07-021-1/+1
| | | | RevBy: Trust me
* Fix bug in SameGame's dialog componentAlan Alpert2010-07-012-1/+3
| | | | | | Was emitting closed after already being closed. Task-number: QTBUG-11812
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-07-012-4/+5
|\
| * Undefined is undefined, and now qml warns about itmae2010-06-291-3/+3
| |
| * Avoid binding loop.Yann Bodson2010-06-291-1/+2
| |
* | Minor Twitter demo enhancementsAlan Alpert2010-06-302-1/+2
|/ | | | First time I actually use it to tweet and I find two bugs...
* Removed unnecessary data_caging_paths.prf loading from applicationsMiikka Heikkinen2010-06-221-1/+0
| | | | | | | | | Since plugin and import paths variables were moved to symbian.conf, there were many unnecessary load(data_caging_paths) statements left in applications. Task-number: QTBUG-11619 Reviewed-by: Janne Koskinen
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-222-4/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Fix examples Updated WebKit to 45d1c9149ef8940081fa8dd35854d2b95ebaf3cd Updated WebKit to 4ad38c43081bedb69c7e26a9ca0fb2c50456066d Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185 Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185 Updated WebKit to 515aae71494436816cd0250cdc52caa4f2566aef Update S60 stuff after renaming the webkit component. Update qmlchanges from import org.webkit to QtWebKit Updated WebKit to e32cb21d4f1787147bcb681883b96a95f867749a Updated WebKit to a99218d1984be36e00966f988123fa7e2b18eec5 Remove the old WebView element in src/import. The new one is in src/3rdparty/webkit Updated WebKit to d7a095a2a9514e1f132b779b99279585820b46f5 Updated WebKit to c6f08f4c13f88491a5d1ae1794c72166af0c26ba
| * Remove the old WebView element in src/import. The new one is in ↵Alexis Menard2010-06-182-4/+3
| | | | | | | | | | | | | | | | | | src/3rdparty/webkit Also change a bit the demo due to a little API change. The module is not org.webkit but QtWebKit now. Reviewed-by:simon hausmann
* | Allow things that load SameGame to disable the Quit buttonAlan Alpert2010-06-211-0/+2
|/ | | | | | | If I missed any, just set inAnotherDemo to true on the SameGame root item. Task-number: QTBUG-11562
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-06-161-0/+2
|\
| * Move knowledge of QGraphicsObject out of qml engineAaron Kennedy2010-06-161-0/+2
| |
* | Minor demo fixesAlan Alpert2010-06-161-0/+2
|/ | | | Found some minor demo issues while testing a TextInput change.
* Add go button to webbrowser example.Yann Bodson2010-06-105-4/+36
| | | | Task-number: QTBUG-11310
* Fix snake demomae2010-06-083-3/+12
| | | | | | | | | Code degeneration lead to three bugs: 1. progress bar worked only the first time 2. restart was broken 3. highscore model was not persistent Reviewed-by: Trust me
* Accept enter key in the webbrower demo url input.Martin Jones2010-06-071-0/+4
|
* Improve input panel handling in declarative demos and examplesJoona Petrell2010-06-037-10/+28
| | | | | Task-number: QTBUG-11157 Reviewed-by: Warwick Allison
* Fix some bugs in the QML Web Browser buttonsAlan Alpert2010-05-312-1/+2
| | | | Now with fewer warnings! Also, the stop button works.
* Fix zoom bug in QML Web Browser demoAlan Alpert2010-05-312-3/+3
| | | | Zooming out no longer zooms to smaller than the window size.