summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Unify naming of import plugin targetsJoona Petrell2010-05-268-10/+21
| | | | | Task-number: QTBUG-10834 Reviewed-by: Warwick Allison
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-05-2616-4/+51
|\ | | | | | | | | Conflicts: examples/declarative/toys/tic-tac-toe/tic-tac-toe.qml
| * geolocation (untested)Warwick Allison2010-05-251-0/+8
| |
| * Integrate some QML examples and demos into qtdemoAlan Alpert2010-05-2414-2/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | Includes minor changes and additions to the existing doc and examples, so that they follow Qt conventions better. Note that while blurring the background was part of the plan for the embedded QML viewer I could not get it to perform well enough. In the future, when blur is fast enough (or someone else can get it to perform better than I) -use-blur should become the default, and -no-blur the option. Task-number: QTBUG-10582
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-241332-33109/+36944
| |\
| | * Doc fixesYann Bodson2010-05-241-2/+2
| | |
| * | Fix typoAlan Alpert2010-05-241-1/+1
| | |
* | | Clean up and don't allow clicks on already filled placesBea Lam2010-05-243-139/+149
| | |
* | | Clean up project files for c++ examplesBea Lam2010-05-244-28/+23
| |/ |/|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-21126-0/+5040
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix FolderListModel parentFolder property's file drive handling Add license headers for .qml files. Also show file/line numbers on XML query errors. Print warnings for xml query syntax errors Clean up Add XmlListModel::get()
| * | Add license headers for .qml files.Jason McDonald2010-05-21126-0/+5040
| |/ | | | | | | | | | | | | Examples get the BSD license, while all other .qml files get the LGPL/tech-preview license. Reviewed-by: Trust Me
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-05-2112-6/+95
|\ \ | |/
| * Make dynamicscene example embeddeable in another graphics sceneAlan Alpert2010-05-201-1/+1
| |
| * Some minor example fixesAlan Alpert2010-05-209-0/+78
| | | | | | | | | | | | -dial moved to dial-example so the dirname is the same as the qml name -added rssnews to .pro so it can be installed -added some README files like the other dirs
| * Fix incorrect mergeAlan Alpert2010-05-201-1/+1
| | | | | | | | Didn't actually notice the name change of that function
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-208-17/+21
| |\ | | | | | | | | | | | | Conflicts: examples/declarative/toys/dynamicscene/qml/itemCreation.js
| * | Fix dynamicscene exampleAlan Alpert2010-05-193-5/+16
| | | | | | | | | | | | | | | | | | | | | In all the renaming (presumably) the moon broke, now fixed. Also made it slightly smaller, to be friendlier to desktop systems with small screens (and the fixed size qtdemo)
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-05-2052-289/+169
|\ \ \ | | |/ | |/|
| * | Rename Component::errorsString() -> errorString() (and also forBea Lam2010-05-204-7/+7
| | | | | | | | | | | | QDeclarativeComponent)
| * | Fixes for docs, example codeBea Lam2010-05-204-11/+10
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-1944-178/+53
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (37 commits) Search for QML import libraries also in application directory Doc improvements Disable mouse-based selection in TextInput/TextEdit Rename qml executable to qmlviewer Don't crash if the target parent is destroyed. Introduce a threaded interpreter for QML binding bytecode Bug moved. doc doc Remove image example (covered in class docs) When changing Loader source, remove old item from scene immediately. Add missing .qmlproject files Fix folderlistmodel with qt namespace Renaming "Qml Launcher" back to "QML Viewer" Rename some examples: proxyviewer -> networkaccessmanagerfactory, Regression fix for Loader anchors not working Make Qt.include() work for js files that have '.pragma library' doc fix Improve docs for Qt.quit() Prevent assignment of values (string, number, bool) to signal handlers. ...
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-1944-178/+53
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (36 commits) Doc improvements Disable mouse-based selection in TextInput/TextEdit Rename qml executable to qmlviewer Don't crash if the target parent is destroyed. Introduce a threaded interpreter for QML binding bytecode Bug moved. doc doc Remove image example (covered in class docs) When changing Loader source, remove old item from scene immediately. Add missing .qmlproject files Fix folderlistmodel with qt namespace Renaming "Qml Launcher" back to "QML Viewer" Rename some examples: proxyviewer -> networkaccessmanagerfactory, Regression fix for Loader anchors not working Make Qt.include() work for js files that have '.pragma library' doc fix Improve docs for Qt.quit() Prevent assignment of values (string, number, bool) to signal handlers. Make sure strings are escaped when returned via asScript. ...
| | | * Remove image example (covered in class docs)Bea Lam2010-05-199-175/+0
| | | |
| | | * Add missing .qmlproject filesBea Lam2010-05-193-0/+48
| | | |
| | | * Rename some examples: proxyviewer -> networkaccessmanagerfactory,Bea Lam2010-05-1833-19/+21
| | | | | | | | | | | | | | | | proxywidgets -> qwidgets, dynamic -> dynamicscene, velocity -> corkboards
| * | | Merge commit 'remotes/origin/4.7' into symbian47Thomas Zander2010-05-194-290/+439
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_s60.cpp
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-181-0/+5
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix weatherinfo and flightinfo to only request WLAN connection once Fix 'chapter5_plugins.dll.sym contains initialized writable data' Fix generation of stub sis files Fix SRCDIR and DEPLOYMENT usage in declarative benchmarks Shadow building on Symbian fixes: part 3 - unchanged source tree Shadow building on Symbian fixes: part 2 - populate bin dir correctly Shadow building on Symbian fixes: part 1 - files to right place Re-enable suppression of --export_all_vtbl for static libraries Omit building declarative/painting benchmark if no OpenGL configured Fix requires keyword handling in qmake in Symbian Support device aliases in EPOCDEVICE Update Symbian DEF files for WINSCW and EABI Fix spurious mouse click when dismissing a native menu Add 'runonphone' target for symbian / makefile Double-click support for virtual cursor in Symbian
| | * | Fix 'chapter5_plugins.dll.sym contains initialized writable data'Alessandro Portale2010-05-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | That's an error that you get when building a qml plugin for a Symbian device. Solution: Add 'TARGET.EPOCALLOWDLLDATA = 1' to the plugin .pro file
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1928-768/+740
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me Requested-by: Legal
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1924-654/+630
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me Requested-by: Legal
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-19106-2926/+2820
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me Requested-by: Legal
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1925-689/+664
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me Requested-by: Legal
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-196-168/+162
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me Requested-by: Legal
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1958-1600/+1542
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me Requested-by: Legal
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1987-2395/+2308
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me Requested-by: Legal
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1914-380/+366
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me Requested-by: Legal
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-199-245/+236
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me Requested-by: Legal
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1927-739/+712
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me Requested-by: Legal
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1931-839/+808
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me Requested-by: Legal
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1918-494/+476
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me Requested-by: Legal
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1923-625/+602
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me Requested-by: Legal
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-196-162/+156
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me Requested-by: Legal
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-197-191/+184
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me Requested-by: Legal
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1912-348/+336
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me Requested-by: Legal
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-196-166/+160
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me Requested-by: Legal
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1936-988/+952
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me Requested-by: Legal
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-193-83/+80
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me Requested-by: Legal
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1962-1702/+1640
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me Requested-by: Legal
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1994-2570/+2476
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me Requested-by: Legal
* | | | Doc: Updated example license to three clause BSD license.David Boddie2010-05-1914-386/+372
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me Requested-by: Legal
generated by cgit v0.12 at 2025-01-28 16:27:39 (GMT)