summaryrefslogtreecommitdiffstats
path: root/demos
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Added fixes left over from previous merges.David Boddie2011-05-111-1/+3
|
* Merge branch 'master' of ../qt-qml-stagingMichael Brasser2011-04-14268-517/+19225
|\
| * Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-07266-512/+19218
| |\ | | | | | | | | | | | | | | | Conflicts: src/gui/text/qfontengine_mac.mm tests/auto/qdiriterator/tst_qdiriterator.cpp
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-04-052-15/+12
| | |\
| | | * Removed mobile demos from the Symbian build in demos.proJerome Pasion2011-04-011-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The demos require QtMobility libraries. Added notices in the demo pages about the requirement. Reviewed-by: Casper van Donderen
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Jerome Pasion2011-03-311-3/+3
| | | |\
| | | * | Fixed demo subdirs for mobile examples.Jerome Pasion2011-03-301-6/+6
| | | | |
| | * | | Minor feature fix led to refactoring for i18n's sake.David Boddie2011-04-058-509/+859
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-18397
| | * | | Fixed string-int concatenation issue.David Boddie2011-04-051-1/+1
| | |/ / | | | | | | | | | | | | Task-number: QTBUG-18086
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Jerome Pasion2011-03-281-1/+2
| | |\ \
| | * | | Imported demo documentation and their images.Jerome Pasion2011-03-106-397/+3
| | | | | | | | | | | | | | | | | | | | Removed user files
| | * | | Removed generated UI file. Not needed in the demo.Jerome Pasion2011-03-101-181/+0
| | | | |
| | * | | Adding quickhit and guitartuner mobile demos.Jerome Pasion2011-03-09205-0/+12750
| | | | |
| | * | | Removed 2 mobile demos. Their replacement will be added separately.Jerome Pasion2011-03-09209-13700/+0
| | | | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-03-091-2/+4
| | |\ \ \
| | * | | | Adding changes to mobile demos.Jerome Pasion2011-03-07213-2119/+2561
| | | | | |
| | * | | | Added 4 mobile demos. Added links and descriptions for them.Jerome Pasion2011-03-03265-1/+19443
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| * | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-312-5/+7
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/example-slideswitch.qdoc doc/src/development/qmake-manual.qdoc doc/src/snippets/code/doc_src_qmake-manual.pro doc/src/snippets/code/doc_src_qtscript.qdoc src/corelib/animation/qabstractanimation.cpp src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qdir/qdir.pro tests/auto/qsslsocket/tst_qsslsocket.cpp tools/qdoc3/doc/qdoc-manual.qdocconf
| | * | | | Fixed pro file syntax in demos/spectrumGareth Stockwell2011-03-291-3/+3
| | | |_|/ | | |/| | | | | | | | | | | | Reviewed-by: Daniel Teske
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-03-271-2/+4
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (185 commits) qdoc: Avoid infinite loops in table of contents generation. Removed the documentation from the install rule. qdoc: Added the <othermeta> element. qdoc: Completed changing <section> structure. Doc: Fixed reference to absolete API in exceptionsafety.html Doc: Removed links to obsolete API in QResource Doc: Fixed broken links in QIcon::fromTheme() Doc: Fixed doc bug in undo framework example Doc: Fixed typo. qdoc: Changed <section> structure. Doc: Typo fixes Doc: Fixed snippet documenting QMetaObject::classInfo Doc: Cannot alter SelectionMode of a combobox's view qdoc: Added <publisher> and <permissions> elements. qdoc: Added <component> element to contain the module name. qdoc: Added <prodinfo> element and its contents to the metadata. Doc: Fixed a doc bug in the Rogue example Doc: Small change to QByteArray::resize() Doc: Small change to ListModel docs Doc: QtDemo now gives error message when example doc cannot be loaded ...
| | | * | Doc: QtDemo now gives error message when example doc cannot be loadedGeir Vattekar2011-03-071-2/+4
| | | |/ | | | | | | | | | | | | | | | | Task-number: QTBUG-16004 Reviewed-by: Richard Moe Gustavsen
* | | | Merge ../qt-qml-stagingYann Bodson2011-03-291-1/+2
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-241-1/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: src/opengl/qwindowsurface_gl.cpp
| | * | Changed maximum heap size for qmlflickr on Symbian.Laszlo Agocs2011-03-221-1/+2
| | |/ | | | | | | | | | | | | | | | | | | 32 MB is certainly not enough to load large (e.g. 12 Mpix or bigger) images. Now it is changed to 128 MB. Reviewed-by: Jani Hautakangas
* | | Merge branch 'master' of ../qt-qml-stagingMartin Jones2011-02-1714-34/+45
|\ \ \ | |/ /
| * | Merge branch earth-team/master into earth-stagingJoão Abecasis2011-02-162-2/+8
| |\ \ | | | | | | | | | | | | | | | | Conflicts: doc/src/development/qmake-manual.qdoc
| | * | demo browser: Verbose output about Zerocopy usageMarkus Goetz2011-02-042-2/+8
| | | |
| * | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-0412-32/+37
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/samegame/SamegameCore/samegame.js mkspecs/features/symbian/default_post.prf src/declarative/qml/qdeclarativeengine.cpp src/gui/text/qtextdocumentlayout.cpp src/plugins/plugins.pro src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtGuiu.def src/s60installs/s60installs.pro tests/auto/declarative/declarative.pro tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp tests/auto/declarative/qmlvisual/qmlvisual.pro
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-02-041-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed wrong casing of a Symbian library. Fixed wrong static library extension on Symbian. Fixed library casing. Remove dependencies to pre-Symbian3 platforms from Symbian3 packages Fix qt.sis platform dependencies for Symbian^3 builds. Fix few QFileDialog static method issues in Symbian^3 Make emulator deployment depend on post linking in symbian-sbsv2.
| | | * Fixed wrong casing of a Symbian library.axis2011-02-031-1/+1
| | | | | | | | | | | | | | | | RevBy: Trust me
| | * | Update Docs, Examples and Demos for new CreateObject overloadableChristopher Ham2011-01-285-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dynamic object in Docs explains QScriptValue argument. SameGame and Dynamic scene now make use of overloadable. Task-number: QTBUG-13087 Reviewed-by: Bea Lam
| | * | photoviewer needs QtQuick 1.1 for Image::cacheBea Lam2011-01-281-1/+1
| | | |
| | * | Update demos following renaming of Image::cachedBea Lam2011-01-191-2/+2
| | | |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-19371-370/+421
| | |\ \ | | | |/
| | * | Introduce Qt.application.active propertyJoona Petrell2011-01-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaces qmlviewer's runtime.activeWindow property. Task-number: QTBUG-13351 Reviewed-by: Martin Jones
| | * | Update Minehunt demo warning messageJoona Petrell2010-12-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The message was talking about a C++ plugin when the demo is nowadays in a form of a standalone executable. Task-number: Reviewed-by: Bea Lam
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Joona Petrell2010-12-202-3/+5
| | |\ \
| | * | | Optimization for photoviewer demo.Michael Brasser2010-12-171-1/+1
| | | | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2010-12-011-2/+3
| | |\ \ \
| | * | | | Add 'cached' property to Image elementYann Bodson2010-11-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting cached to false is useful when dealing with large images, to make sure that they aren't cached at the expense of small 'ui element' images. Task-number: QTBUG-7300 Reviewed-by: Aaron Kennedy
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Yann Bodson2010-11-1218-490/+407
| | |\ \ \ \
| | * | | | | Fix QML calculator demo being wrongly rotated for landscape devicesJoona Petrell2010-11-021-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14909 Reviewed-by: Martin Jones
| | * | | | | Increase cachebuffer in Flickr demo to quarantee expanded delegate is not ↵Joona Petrell2010-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deleted the during device orientation change Task-number: QT-3824 Reviewed-by: Martin Jones
| | * | | | | Fix zooming in declarative webbrowser demoJoona Petrell2010-10-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Martin Jones
* | | | | | | Only ask for name when the user goes on the high score list.Alan Alpert2011-02-041-5/+36
|/ / / / / / | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14714
* | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-17371-370/+421
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Allow IAP to be selected in Phonon MMF backendRuth Sadler2011-01-113-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Phonon API does not provide any way for the client to specify which network connection should be used for streaming playback. If the application already has a connection open, using a bearer other than the default (e.g. using WiFi when the device default is GPRS), it may be desirable to use it for streaming, rather than allowing the Phonon backend to open a second connection on the default bearer. This patch adds a custom property on the Phonon::MediaObject, called InternetAccessPointName. The client can specify the IAP which Phonon should use by setting this property. Note that support for this property is only provided in the Phonon MMF backend. Task-number: QTBUG-11436 Reviewed-by: Gareth Stockwell
| * | | | | Update copyright year to 2011.Jason McDonald2011-01-10370-370/+370
| | |_|_|/ | |/| | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-201-2/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.pro src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/plugins/phonon/mmf/mmf.pro src/s60installs/s60installs.pro tests/auto/qapplication/test/test.pro tests/auto/qgraphicsview/tst_qgraphicsview.cpp
| * | | | Fix deployment of minehunt for SymbianDamian Jansen2010-12-201-1/+1
| | | | | | | | | | | | | | | | | | | | Task: QT-4298
generated by cgit v0.12 at 2024-11-11 21:15:16 (GMT)