summaryrefslogtreecommitdiffstats
path: root/demos/declarative
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1763-63/+63
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * Update copyright year to 2011.Jason McDonald2011-01-1063-63/+63
| | | | | | | | Reviewed-by: Trust Me
| * Fix deployment of minehunt for SymbianDamian Jansen2010-12-201-1/+1
| | | | | | | | Task: QT-4298
* | Merge remote branch 'qt/master' into file-engine-refactorJoão Abecasis2010-11-239-104/+133
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.pro src/corelib/io/io.pri src/corelib/io/qfsfileengine.cpp src/corelib/io/qfsfileengine_unix.cpp src/corelib/io/qfsfileengine_win.cpp src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtDeclarativeu.def src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtDeclarativeu.def src/s60installs/eabi/QtGuiu.def tests/auto/qapplication/test/test.pro tests/auto/qaudioinput/qaudioinput.pro tests/auto/qaudiooutput/qaudiooutput.pro tests/auto/qchar/qchar.pro tests/auto/qdiriterator/qdiriterator.pro tests/auto/qsound/qsound.pro
| * \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-123-6/+3
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure doc/src/snippets/code/doc_src_qmake-manual.qdoc mkspecs/features/symbian/application_icon.prf mkspecs/features/symbian/default_post.prf mkspecs/features/symbian/symbian_building.prf qmake/generators/symbian/initprojectdeploy_symbian.cpp src/multimedia/audio/audio.pri src/network/access/qnetworkaccessmanager.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl_p.h src/plugins/bearer/corewlan/qcorewlanengine.mm src/plugins/phonon/mmf/mmf.pro tests/auto/qscriptvalue/tst_qscriptvalue.cpp tests/auto/qscriptvalue/tst_qscriptvalue.h tools/qdoc3/doc/qdoc-manual.qdocconf
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-11-051-2/+1
| | |\
| | | * Fix minehunt.pro (minehunt is no longer a plugin)Bea Lam2010-11-051-2/+1
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15011 Reviewed-by: Martin Jones
| | * | Don't allow flagging of flipped tiles in MinehuntAlan Alpert2010-11-051-1/+1
| | | | | | | | | | | | | | | | Task-number: QTBUG-4249
| | * | Fix samegame text input focusAlan Alpert2010-11-051-3/+1
| | |/ | | | | | | | | | | | | | | | | | | The real problem is QTBUG-15047, but by implementing SameGame in a different way it gets worked around very nicely. Task-number: QTBUG-14716
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-301-90/+108
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add autotest for QScriptExtensionPlugin Improve QtScript test coverage Don't crash when null-pointer is passed to qScriptValueFromValue() Simplify object lifetime management when moving objects to a QThread samegame: white space Move list of trusted benchmarks out of QA dungeon and into Qt Don't put Objective-C sources in SOURCES mkspecs: Emit warning when including g++.conf directly
| | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-301-90/+108
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add autotest for QScriptExtensionPlugin Improve QtScript test coverage Don't crash when null-pointer is passed to qScriptValueFromValue() Simplify object lifetime management when moving objects to a QThread samegame: white space Move list of trusted benchmarks out of QA dungeon and into Qt Don't put Objective-C sources in SOURCES mkspecs: Emit warning when including g++.conf directly
| | | * | samegame: white spacehjk2010-10-281-90/+108
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Kai Koehne
| * | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-302-3/+4
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-292-3/+4
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Play whole file in spectrum analyzer demo Do not unnecessarily reset state of spectrum demo Set SpectrumAnalyserThread parent to 0 before calling moveToThread() Avoid being killed by graphics out-of-memory monitor. Revert function renaming in QtOpenVG. Support tactile feedback in QWidgets from QS60Style Support tactile feeedback from QS60Style for QWidgets Making the buttons less finger unfriendly Readded .def file entries after a little stunt Do not crash on Symbian Temporarily remove .def file entries for a little stunt Fixed crash with QClipboard in Symbian^3 Fallback to vgWritePixels in drawPixmap.
| | | * | Making the buttons less finger unfriendlyAlessandro Portale2010-10-282-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | I did not dare to apply the same fix to the samegame tutorials, since those are completely diverged from the demo.
| * | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-291-1/+1
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| |
| | * | Missing part of 64a05cfa97b1192ac247558c0601ba0e4ec464c9Alan Alpert2010-10-281-1/+1
| | |/ | | | | | | | | | Task-number: QT-4200
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-254-4/+15
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/snake/snake.qml qmake/generators/symbian/symbiancommon.cpp src/network/access/qnetworkaccessmanager.cpp src/s60installs/s60installs.pro tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| | * Fix Twitter demo's list view for devicesJoona Petrell2010-10-191-1/+1
| | | | | | | | | | | | | | | | | | | | | The height of ListView in Twitter demo was fixed, which looked bad when the demo was run maximized or in a full screen mode on devices. Task-number: Reviewed-by: Aaron Kennedy
| | * Snake demo now pauses when the window loses focus.Alan Alpert2010-10-153-3/+13
| | | | | | | | | | | | Task-number: QTBUG-11592
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-151-1/+3
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qpaintengine_raster.cpp tests/auto/declarative/qdeclarativetext/data/alignments_cb.png tests/auto/declarative/qdeclarativetext/data/alignments_cc.png tests/auto/declarative/qdeclarativetext/data/alignments_ct.png
| | * Make minehunt less cheerfulAlan Alpert2010-10-141-1/+3
| | | | | | | | | | | | | | | | | | An instance of failure being improperly shown as victory was rectified. Task-number: QT-3956
| * | Align .pro with qmake: s/\.sources/.files/.Miikka Heikkinen2010-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Complement previous commit by aligning Qt itself to use .files consistently for DEPLOYMENT as well as INSTALLS. This excludes changes to webkit. Task-number: QTBUG-3216 Reviewed-by: axis
* | | Fix deployment for examples and testsShane Kearns2010-10-121-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | Due to the change from default deployment in symbian from being hardcoded in qmake to being in default_deployment.prf the .pro files needed to be changed. Specifically, "DEPLOYMENT = foo" needs to be "DEPLOYMENT += foo" otherwise the default deployment lines are not added and the test won't install. Reviewed-By: Miikka Heikkinen
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-076-11/+38
|\ \ | |/
| * Rename toolbar button.Yann Bodson2010-10-061-1/+1
| | | | | | | | Task-number: QT-3637
| * Do not show 'More' button when in fullscreen view.Yann Bodson2010-10-062-9/+15
| | | | | | | | Task-number: QTBUG-11813
| * Fix minehunt execution from QtDemoJoona Petrell2010-10-063-1/+22
| | | | | | | | | | Task-number: QTBUG-14250 Reviewed-by: Martin Jones
* | 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
generated by cgit v0.12 at 2025-01-15 19:39:32 (GMT)