summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* make example work againmae2010-03-032-5/+5
| | | | | The code is now a bit on the imperative side, but that was the only working solution to remove the binding loops.
* More renaming: MouseRegion -> MouseAreaYann Bodson2010-03-033-3/+3
|
* Merge branch 'master' into 4.7Yann Bodson2010-03-035-0/+311
|\
| * add colorbrowser qml exampleYann Bodson2010-03-035-0/+311
| | | | | | | | This example shows how to use qml packages to animate between pathview, gridview and listview.
* | Add import Qt.widgets 4.6 to layout.qml exampleJoona Petrell2010-03-031-1/+1
| |
* | Adapted example to use the import mechanismmae2010-03-025-31/+40
| |
* | Merge branch 'master' into 4.7Warwick Allison2010-03-029-1/+9
|\ \ | |/ | | | | | | Conflicts: tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
| * Move WebView to an extension plugin.Warwick Allison2010-03-029-1/+9
| | | | | | | | | | | | | | | | Using WebView now requires: import org.webkit 1.0 Task-number: QT-2995
| * Example of text focus.Warwick Allison2010-03-021-0/+83
| | | | | | | | Task-number: QT-448
* | Example of text focus.Warwick Allison2010-03-021-0/+83
| | | | | | | | Task-number: QT-448
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-0230-325/+66
|\ \ | |/
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAaron Kennedy2010-03-0227-27/+31
| |\ | | | | | | | | | | | | | | | Conflicts: demos/declarative/minehunt/main.cpp demos/declarative/minehunt/minehunt.qml
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlYann Bodson2010-03-0126-15/+15
| | |\
| | * | use ParentAnimationYann Bodson2010-03-011-12/+16
| | | |
| * | | Make "on" syntax mandatory for value sources and interceptorsAaron Kennedy2010-03-0229-313/+50
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Where you would have written x: NumberAnimation {} y: Behavior {} you now must write NumberAnimation on x {} Behavior on y {} This change also makes the parser more strict with respect to multiple assignments to a single property - they're no longer allowed. For example this x: 10 x: 11 is now an error.
* | | Add docs and tests for WorkerListModel.Bea Lam2010-03-022-0/+47
| |/ |/| | | | | Task-number: QT-2807
* | Make SameGame tutorials share imagesAlan Alpert2010-03-0126-15/+15
|/ | | | | | | | | It's a bit of a waste to have four copies of all of the images. And as an advanced tutorial throwing in a minor complication like this is probably beneficial. Additionally, the background has been replaced by a smaller JPEG version.
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-264-74/+89
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: (81 commits) Added addMMPRules for adding conditional MMP_RULES Allow overriding TARGET.EPOCHEAPSIZE with MMP_RULES Build break fix for commit d8465414e6fd543cfc20e732030dedd8d2bc685f. Fix for cetest. Speed up compilation of this test with MSVC. New benchmark for QDirIterator Backporting auto-test utility header from master. Fix a signed/unsigned comparison compiler warning Removed an export that shouldn't be exported. Reduced the code and memory footprint of the keymap. Enabled Qt key events to work also when native key code is missing. Cleaning of the patch to QTBUG-3168 Patch to QTBUG-3168 Crash in QGraphicsScenePrivate::setFocusItemHelper Pass the right arguments to QApplication in GraphicsView benchmark. Improvements to itemview keypad navigation in S60. Revert changes made in scroll_sys(). Fix SymbianMakefileGenerator::absolutizePath for clean builds Set the roleNames of proxy models to the roleNames of the source model. Add benchmarks for accessing meta-object properties via QScriptValue ...
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-264-74/+89
| |\ | | | | | | | | | | | | | | | Conflicts: qmake/generators/symbian/initprojectdeploy_symbian.cpp qmake/generators/symbian/symmake_abld.h
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-224-74/+89
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QFontDialog::exec() never returns on OSX QNetworkRequest: Doc enhancement Port http example to QNetworkAccessManager loopback network example: Make use of bytesToWrite()
| | | * Port http example to QNetworkAccessManagerMarkus Goetz2010-02-223-71/+82
| | | | | | | | | | | | | | | | | | | | | | | | QHttp. Must. Die. Reviewed-by: Peter Hartmann
| | | * loopback network example: Make use of bytesToWrite()Markus Goetz2010-02-211-3/+7
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
* | | | Change Connection syntax as per QT-2822.Warwick Allison2010-02-261-2/+2
| | | |
* | | | Renamed Flickable viewportXXX properties contentXXXMartin Jones2010-02-267-12/+12
| | | | | | | | | | | | | | | | A viewport is the thing you look through, not what you look at.
* | | | Introduced QDeclarativeExtensionPlugin::registerTypes(uri).Roberto Raggi2010-02-251-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | Now, you have to reimplement registerTypes(uri) to expose native QML types, and initializeEngine(engine,uri) to add instances to the QML engine's root context.
* | | | Add simple Package example.Martin Jones2010-02-252-0/+79
| | | |
* | | | Connections example could be turned incorrectlyYann Bodson2010-02-251-8/+4
| | | | | | | | | | | | | | | | Task-number: QTBUG-8345
* | | | Add subdirs .pro for examples/declarative/extendingAaron Kennedy2010-02-242-0/+14
| | | | | | | | | | | | | | | | Also fix up a compile error.
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-241-0/+1
|\ \ \ \
| * | | | Add an "asynchonous" property to Image.Martin Jones2010-02-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Allows loading/decoding local images in an asynchronous thread (already the case for network images).
* | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtWarwick Allison2010-02-2420-1/+3092
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | Conflicts: tests/auto/declarative/qmlgraphicsborderimage/tst_qmlgraphicsborderimage.cpp tests/auto/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp
| * | | Merge remote branch 'origin/master' into bearermanagement/stagingAaron McCarthy2010-02-2371-114/+218
| |\ \ \
| * \ \ \ Merge remote branch 'origin/master' into bearermanagement/unit-testsAaron McCarthy2010-02-2286-465/+706
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/network/access/qnetworkaccessmanager.cpp
| * \ \ \ \ Merge remote branch 'origin/master' into bearermanagement/unit-testsAaron McCarthy2010-02-173-98/+98
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote branch 'origin/master' into bearermanagement/integrationAaron McCarthy2010-02-14324-1/+12534
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qlineedit/tst_qlineedit.cpp
| * \ \ \ \ \ \ Merge remote branch 'origin/master' into bearermanagement/integrationAaron McCarthy2010-02-1155-1362/+524
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure
| * \ \ \ \ \ \ \ Merge remote branch 'origin/4.6' into bearermanagement/integrationAaron McCarthy2010-02-1117-20/+29
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/s60installs/s60installs.pro
| * | | | | | | | | Display session statistics.Aaron McCarthy2010-02-083-4/+69
| | | | | | | | | |
| * | | | | | | | | Merge commit 'origin/4.6' into bearermanagement/integration-4Aaron McCarthy2010-01-291133-1487/+1560
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/gui/painting/qpainter.cpp src/s60installs/s60installs.pro
| * \ \ \ \ \ \ \ \ \ Merge commit 'BearerIntegration-4' into bearermanagement/integration-4Aaron McCarthy2010-01-293-211/+219
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/unix/networkmanager/networkmanager.pro src/network/bearer/bearer.pro src/network/bearer/qnetworkconfiguration_s60_p.cpp tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro
| | * | | | | | | | | | Bearer Management Integration 4.Aaron McCarthy2010-01-293-211/+219
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'bearermanagement/corewlan' into bearermanagement/integration-2Aaron McCarthy2010-01-0513-32/+25
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/mac/corewlan/corewlan.pro examples/network/bearercloud/bearercloud.pro examples/network/bearermonitor/bearermonitor.pro src/network/bearer/bearer.pro src/network/bearer/qnativewifiengine_win.cpp src/network/bearer/qnetworkconfigmanager_p.cpp src/network/bearer/qnetworkconfiguration_s60_p.cpp src/network/bearer/qnetworksession.cpp src/network/bearer/qnetworksession_p.cpp src/network/bearer/qnmwifiengine_unix.cpp src/network/bearer/qnmwifiengine_unix_p.h src/plugins/bearer/corewlan/qcorewlanengine.mm src/plugins/bearer/generic/qgenericengine.cpp src/plugins/bearer/nla/main.cpp src/plugins/bearer/nla/qnlaengine.cpp tests/auto/qnetworkconfigmanager/qnetworkconfigmanager.pro tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro tests/auto/qnetworksession/lackey/lackey.pro tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro tests/manual/bearerex/bearerex.pro tests/manual/networkmanager/networkmanager.pro
| | * | | | | | | | | | Fix up license headers.Aaron McCarthy2009-12-2210-10/+10
| | | | | | | | | | | |
| | * | | | | | | | | | Make compile.Aaron McCarthy2009-12-227-40/+14
| | | | | | | | | | | |
| * | | | | | | | | | | Bearer Management Integration 2.Aaron McCarthy2010-01-045-28/+26
| |/ / / / / / / / / /
| * | | | | | | | | | Bearer Management Integration 1.Aaron McCarthy2009-12-2219-0/+3027
| | | | | | | | | | |
* | | | | | | | | | | Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to ↵Warwick Allison2010-02-2446-129/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDeclarativeXXX.
* | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-2324-94/+103
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/util/qmlanimation.cpp src/declarative/util/qmlxmllistmodel.cpp
| * | | | | | | | | | | Get rid of the useless import 'files'Roberto Raggi2010-02-231-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: mae
| * | | | | | | | | | | Fixed the install rules for the QML plugins example.Roberto Raggi2010-02-231-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Install the QML components in $[QT_INSTALL_EXAMPLES]/declarative/plugins/com/nokia/TimeExample and the source files in $[QT_INSTALL_EXAMPLES]/declarative/plugins/