aboutsummaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Make example work on WindowsGunnar Sletta2013-10-222-23/+10
| | | | | Change-Id: I75a035939a390de8cdae03c11599efa0b7ed68df Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Increased precision in shader exampleBernd Weimer2013-10-171-2/+2
| | | | | | | | On BB10 the shader effect displayed as a black rectangle. Change-Id: I9cd12e66875c07cc7ecfa2aec6d7e5912926511e Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Animator overview docs and example.Gunnar Sletta2013-10-034-0/+123
| | | | | Change-Id: If0852e48dbbfea4fadca9c897ea0e62393763055 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Convenience class for FBO rendering in Qt QuickGunnar Sletta2013-09-253-77/+19
| | | | | Change-Id: I5712bbfa0cde9f2fe5fddc35c4cc23597717065c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Apply file selectors to QQmlApplicationEngine appsAlan Alpert2013-09-209-7/+66
| | | | | | | | | You can also manually apply them to a QQmlEngine using setUrlInterceptor(new QQmlFileSelector(parent)), or using your own QQmlAbstractUrlInterceptor subclass. Change-Id: I0c0ff8b080c138686b3c03e0bc3b9f25bcd11a85 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Merge "Merge branch 'stable' into dev" into refs/staging/devSergio Ahumada2013-09-196-0/+141
|\
| * Merge branch 'stable' into devSergio Ahumada2013-09-196-0/+141
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/qml/qml/v8/qqmlbuiltinfunctions.cpp tests/auto/qml/qml.pro Change-Id: Ib373aed6a8f8df9521740fb5b080daed38546cd2
| | * Doc: Reintroduce docs for Qt Quick Models and Views examplesTopi Reinio2013-09-186-0/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | The .qdoc files/images for these examples were lost during modularization. This change adds them back and fixes related links. Change-Id: Id5260daad1c38284e3aa8178ae82d24067f4e88c Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | | Adding QtQuick.Dialogs.MessageDialogShawn Rutledge2013-09-199-1/+400
|/ / | | | | | | | | Change-Id: Ifa3de21e6f611c24742118d6d178edbe14f243be Reviewed-by: Liang Qi <liang.qi@digia.com>
* | Add FontDialog to QtQuick.DialogsLiang Qi2013-09-184-2/+163
| | | | | | | | | | | | | | | | | | | | | | | | | | As with FileDialog, it tries QPA, then QFontDialog, and falls back to a QML implementation (which is also provided here) if neither type of native dialog is available. The update of plugins.qmltypes files will be in a separate commit. Task-number: QTBUG-31852 Done-with: Shawn Rutledge <shawn.rutledge@digia.com> Change-Id: I066ebbcf44c413af26020ddf8414252b99f5218b Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | Qt Quick Dialogs: can see and control geometry of QML implementationsShawn Rutledge2013-09-171-0/+11
| | | | | | | | | | | | | | | | | | | | | | QQuickAbstractDialog had x/y/width/height properties already but they didn't do anything. It's still not possible with the native dialogs because neither QPlatformDialogHelper nor QFileDialogOptions etc. have any geometric properties; but the application author can now see and control the geometry of any QML dialog implementation. Change-Id: Icdac9592c72e81175436436027f7fe3d75ff7f42 Reviewed-by: Liang Qi <liang.qi@digia.com>
* | systemdialogs example bug fix: don't allow clicking through tabsShawn Rutledge2013-09-131-1/+3
| | | | | | | | | | | | | | | | | | | | | | For example on Font Dialogs tab of examples/quick/dialogs/systemdialogs/systemdialogs.qml it was possible to open the color dialog by clicking slightly below the open button, because the color dialog tab was behind the current one. Change-Id: If9917e2baef7cfd49a0d01acd73ffa69dfcee088 Reviewed-by: Liang Qi <liang.qi@digia.com>
* | Add support for external drag and drop in Quick items.Chris Meyer2013-09-099-0/+284
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add dragType enums with values of None, Automatic, Internal (default). Setting to Automatic allows startDrag to be called automatically. Setting to Internal (default) retains old behavior. Add mimeData to Drag item to enable external drags. Call startDrag to start drag manually or change from internal drag to external drag. Added events dragStarted and dragFinished that get invoked from startDrag. Mime data must be specified in the mimeData property as mime-type / data pairs. Moved QQuickDrag from qquickmousearea* files to qquickdrag* files to reduce header interdependencies that caused linking errors in other modules and also to improve code organization. Allow DropArea to receive and process external data. Introduced new variable containsDrag to QQuickDropAreaPrivate. This replaces mimeData which was previously being used to determine if a drop operation was currently occurring. The problem was that mimeData was being externally destructed. Also introduced accessor methods for getting color, html, image, text, and urls out of the drop. This facilitates dropping of external data of those types onto a DropArea. Added example quick/externaldraganddrop. Task-number: QTBUG-27498 Change-Id: I1420df7c161ea3399e49a23305273e106baa246f Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-1975-3980/+353
|\| | | | | | | | | | | | | | | Conflicts: tests/auto/quick/qquickgridview/qquickgridview.pro tests/auto/quick/qquickitem/qquickitem.pro Change-Id: Ic54cafbdda1ac22757d2ee65dcc63a1b167c7556
| * Doc: Update example used for QML getting started tutorialTopi Reinio2013-08-0916-268/+353
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the example project referred to in Getting Started with Qt Quick tutorial. - Fix coding/comment style issues - Change plugin TARGET name, Use /imports as the destination directory - Fix qmldir with proper module info, delete unused qmldir from /core - Add a .qmlproject file Change-Id: If269e61fb76399faae753469dc251d07cc219139 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Doc: Remove unused /parts directory from QML getting started exampleTopi Reinio2013-08-0256-3718/+0
| | | | | | | | | | | | | | | | | | | | | | | | The example code for getting started with QML doc has six smaller projects under /parts - these out of sync with the main example code in its parent directory, they are undocumented and not referred to in any other documentation. The QML getting started guide itself uses \code blocks to present the code snippets. Change-Id: I3b9c83a60fdeb9fa13f364b04c38943222c682cb Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Make buttons and tabs larger in QML examples and dialogsShawn Rutledge2013-07-294-8/+14
| | | | | | | | | | | | Task-number: QTBUG-32578 Change-Id: Ic89058abc55e5e079f44862986b2132114456147 Reviewed-by: Liang Qi <liang.qi@digia.com>
* | FileDialogs example: added option to open the filesShawn Rutledge2013-08-151-1/+10
| | | | | | | | | | | | | | | | Qt.openUrlExternally is a nice feature to remind users about, and gives this file dialog some purpose. Change-Id: I56e436f8b2f4362891450d57b6d9c36e26983513 Reviewed-by: Liang Qi <liang.qi@digia.com>
* | examples: set application name and organization for QSettingsShawn Rutledge2013-08-151-0/+3
| | | | | | | | | | | | | | | | With the Qt.labs.settings module available, it makes sense for each example to have its own settings file. Change-Id: I8257f04ec13c7caf9995e03626e5453c653cfb92 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Doc: Renamed accessibility example to "quick-accessibility".Jerome Pasion2013-08-1310-3/+3
| | | | | | | | | | | | | | | | -Generated HTML file name conflicted with accessibility group. Task-number: QTBUG-32580 Change-Id: I5f5a4bb8134268c58105ea61d5ae3bbdd35c0d50 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Doc: Renamed and moved examples/qml/i18n to examples/qml/qml-i18nJerome Pasion2013-08-138-10/+10
| | | | | | | | | | | | | | | | | | -the generated HTML page conflicts with the i18n.html page from qtdoc. -edited the content. Task-number: QTBUG-32580 Change-Id: I32ded1913d9faecb95e28043983e957ccd0e8749 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Doc: Moved QML "plugins" example to "qmlextensionplugins"Jerome Pasion2013-08-0913-6/+5
| | | | | | | | | | | | | | | | | | | | The example generates a plugins.html which collides with the plugins.html from qtbase repository. Task-number: QTBUG-32580 Change-Id: I47ce9e00378738f7696672e6e47dd3337bb4fafc Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Merge "Merge branch 'stable' into dev" into refs/staging/devSergio Ahumada2013-08-067-54/+181
|\ \
| * | Merge branch 'stable' into devSergio Ahumada2013-08-057-54/+181
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I06f79bcbde13c7b12905492a17dbcbb4a594e557
| | * Doc: Update Tweet Search Demo to use Twitter Search API v1.1Topi Reinio2013-07-266-53/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Twitter REST API v1 is no longer supported. This change updates the Tweet Search Demo to use the new version (v1.1). Specifically, - Use of OAuth tokens (authentication required in v1.1) - JSON parsing for results instead of XML - Use of url/hashtag/username entities returned in search results Also, update the documentation to discuss authentication and registering the application to dev.twitter.com. Task-number: QTBUG-31745 Change-Id: I00cd7b07f065babb03483daabe8df22f22995c29 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| | * Doc: Modified the term for the Qt global object.Jerome Pasion2013-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtQml::Qt is a "QML global object" to differentiate it from the Qt namespace. "QML Qt object" "QML Qt global object" "Qt global object" (in the context of QML-only pages) Change-Id: I1d2896ad48e8432c5eb8b18f05af247986bff336 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | | Merge branch 'wip/v4' of ssh://codereview.qt-project.org/qt/qtdeclarative ↵Simon Hausmann2013-08-061-0/+1
|\ \ \ | |/ / |/| | | | | | | | | | | into dev Change-Id: I278524d0f43d2237201d9cf78c1c36a5ecc83d84
| * | Prospective iOS build fixSimon Hausmann2013-07-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | For some reason no Makefile is created for this .pro file. TEMPLATE = app should be the default, but OTOH it's missing here. Change-Id: I499d13368944e552ee85a0c6f194c09e4c19bf8e Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | | Fix image URLAlan Alpert2013-07-301-1/+1
|/ / | | | | | | | | Change-Id: I4abac2a842453dbf6838f55703956b2fd53b8f37 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-236-11/+7
|\| | | | | | | Change-Id: I2279f181b1c30e81651f8907447ec5c826e11475
| * Put back OTHER_FILES in systemdialogs exampleShawn Rutledge2013-07-221-0/+5
| | | | | | | | | | | | | | | | | | Partial revert of 1e9589eb0c2bb9404e11c69e1d76ef9efd89af56. Creator currently needs this variable in order to find the QML files. (see https://bugreports.qt-project.org/browse/QTCREATORBUG-9860) Change-Id: Id5882dfe9733a6b401976e4d6e5baf2066d21b1b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * remove pointless assignmentsOswald Buddenhagen2013-07-221-9/+0
| | | | | | | | | | | | | | the magic in qt_example_installs.prf handles this automatically. Change-Id: I19f0560a6e3d2ddbe8a0128b463aecb7ff45475e Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| * unbreak installation after project moveOswald Buddenhagen2013-07-221-1/+1
| | | | | | | | | | Change-Id: I47e9e7009978b494e6b2b06f793bf1948d443b72 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| * systemdialogs example: ensure that all QML files work with qmlsceneShawn Rutledge2013-07-175-6/+6
| | | | | | | | | | | | | | | | | | Sync up relative paths in the qrc and the actual directories so that you can run qmlscene with any of the QML files in this directory and it will still find the shared resources. Change-Id: I0f216df6b370c19948312fa00a33ce77ccabcd78 Reviewed-by: Liang Qi <liang.qi@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-111-3/+3
|\| | | | | | | Change-Id: Idaaeba880a175166437e2a7266716c776c4483c6
| * Window example: delay showing the splash until Component.onCompletedShawn Rutledge2013-07-111-3/+3
| | | | | | | | | | | | | | | | Otherwise it will have the wrong size on KDE. Task-number: QTBUG-32223 Change-Id: I3ed92ff8aead5c6e5a37a5189c7103a5383087ae Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-0421-25/+548
|\| | | | | | | Change-Id: I15cb7460171b38d11d66367aeb0831ec6e3ca933
| * Remove objectlistmodel.qmlproject file.Friedemann Kleint2013-07-041-14/+0
| | | | | | | | | | | | | | | | The example has C++ source code and cannot be run as qmlproject. Change-Id: I2d71d3ffc600ca71898ad402499f7a070455c266 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Example for running animations on the render threadGunnar Sletta2013-07-018-0/+409
| | | | | | | | | | Change-Id: I7a829f201c9d1514b2462e7f3bd11761d02cb66c Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-2812-11/+139
| |\ | | | | | | | | | Change-Id: I140852ef7fbbfe303dac620af5e6eba5ee3a4b02
| | * FileDialog.folder property should also be a QUrl, for consistencyv5.1.0-rc2v5.1.0Shawn Rutledge2013-06-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In QtQuick we never use plain file paths, because URL is more general. Also use const references for string and URL setters, and fixed the dependency between the FolderListModel's folder, the field for editing it, and the folder property of the AbstractFileDialog. Change-Id: I6e965b80b73d4eb2473712a4f4d4f816b768d802 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| | * photosurface: add C++ boilerplate launcher; open buttonShawn Rutledge2013-06-2610-1/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creator refuses to build it for Android otherwise, and this is a good demo for tablets. Also added a button to re-open the FileDialog. Task-number: QTBUG-31898 Change-Id: I9f90de316fcaa2679484f8a875737ffafa774f31 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
| | * Declarative dialog improvements for the non-Window use caseShawn Rutledge2013-06-261-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Platforms like Android and EGL don't support multiple top-level windows, so we have to avoid trying to use widget-based dialogs (because a widget dialog on top of a scene graph will result in a second window), allow the QML dialog to be an Item, and decorate it to look like a window. Task-number: QTBUG-31898 Change-Id: I9af049f3265188e8be677a05a8bc6d1699b4cd00 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-2412-29/+38
|\| | | | | | | | | | | Change-Id: I444ed90a02eebe1f68cfa48be5d75544123ab10d
| * | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-2012-29/+38
| |\| | | | | | | | | | Change-Id: I6bd61ebda17c34f51a4c4ece4852ab144bf542a6
| | * Doc: Changed the title to avoid name conflicts and linking errorsVenu2013-06-182-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-30173 Change-Id: Ibf6626cdfc205c48ca634491661c87414bbddf24 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
| | * photosurface demo: behavior depends on initialization orderShawn Rutledge2013-06-141-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file dialog wasn't appearing on the mac. This way seems to work. We have a long-term bug here but this workaround will look better for the release. Change-Id: I8538ca5dc11a063591bc4557fd3779c5bb3768b5 Task-number: QTBUG-31699 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| | * move quick dialogs example into an artificial subdirectory againv5.1.0-rc1Shawn Rutledge2013-06-129-25/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The trouble with Id28d5718b4b7b475dcd7d62e31c4634219dc3ddc is that the build assumes that all example directories are subdirectories, so the examples-manifest.xml will point to the wrong place and creator ends up not having the example on the welcome page. That's more rigid than it should be, but we might as well use the opportunity to distinguish system dialogs from any QML-only dialogs that might be added to this module later on. Change-Id: I6e7261e096d75df560c6ce608af4c54b82e52d13 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-2018-0/+1201
|\| | | | | | | | | | | Change-Id: I5cc2cacd26004ba18f0c6214759f5e073b5c6cfb
| * | Graph exampleGunnar Sletta2013-06-1418-0/+1201
| |/ | | | | | | | | Change-Id: I4a7b52f6e14182aed31354dc3860ef187e1899a4 Reviewed-by: Alan Alpert <aalpert@blackberry.com>