aboutsummaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
...
* | | 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>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-1210-28/+27
|\| | | | | | | Change-Id: I045587eac266e9b6296d9cd9e3c73031fe18bbd1
| * Clean up qt quick dialogs example againShawn Rutledge2013-06-119-28/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I5245a6931606673733130b1f168fddafe8def695 took us the wrong direction: the intention was to put ALL dialogs in one example, because each example has some overhead (project, docs, screenshot, c++ launcher) and we don't want to have several more separate examples after the other dialog types are added. Color and file dialogs have no relationship to each other except that they happened to be implemented first. This is analogous to qtbase/examples/widgets/dialogs/standarddialogs And in fact, each dialog type is in a separate qml file, so you can run them individually with qmlscene anyway, which will keep this from becoming unwieldy and hard to understand. Change-Id: Id28d5718b4b7b475dcd7d62e31c4634219dc3ddc Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
| * Set incubation controller when a Window{} is loaded via QQmlApplicationEngineAlan Alpert2013-06-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was the one convenience that was lost when transitioning templates from QQuickView + Item{} to QQmlApplicationEngine + Window{}. As the default window incubation controller was tied to the first window's frameSwapped, we could easily run into a situation where a secondary window required incubation while the first window was idle. This would then starve the incubation controller. Instead make it so that the renderloop emits "timeToIncubate" once it is done with a renderpass over all windows, so the incubator gets to run once and exactly once per vsync when animating. The incubator logic was also flawed in that it could post a lot of events to itself as a result of incubatingObjectCountChanged and thus starve system events while processing incubation requests. Now we start a timer and don't start it again until we have completed an incubation pass. Task-number: QTBUG-31203 Change-Id: Iea9e2c81efb46bb7875c70ccda0cdc4b3b3e58e7 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-0417-33/+133
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ib8b5509c48a686f6e916708d83914e13e4f67e9c
| * Added QQuickWindow::setDefaultAlphaBuffer()Shawn Rutledge2013-05-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | All QQuickWindows will render using the same OpenGL context, so for a window to support transparency, the OpenGL context needs to be created with support for transparency from the very start. Therefore the application needs to call setDefaultAlphaBuffer() before creating windows. There are some relevant comments in QTBUG-20768 although the bug itself is not the same use case (it was already OK as long as the first window had a translucent color, because of setAlphaBufferSize in QQuickWindow::setColor()). Change-Id: I92e111c1a62c0d510821b646fd334e52254f8f57 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| * Fix various bugs in calqlatrShawn Rutledge2013-05-305-10/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's still not a great example but at least it's somewhat usable now. - added files to .pro so you see them all in Creator - keypad is fixed size and the "tape" takes up the rest, so you can resize the window to be able to see long numbers - you can flick the ListView (MouseArea not on top of the whole thing!) - ListView scrolls to the bottom when you add numbers past the point that scrolling is necessary to see them - Clear, sqrt and +/- keys are functional Task-number: QTBUG-26556 Change-Id: I485e4123ad6c24ca64bad3efc3acfc14587268d8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| * window example: show only the splash screen until the timeoutShawn Rutledge2013-05-302-6/+12
| | | | | | | | | | | | | | | | The window takes time to resize itself; we can avoid letting the user see that by delaying visibility of the main window. Change-Id: I81d656102b384a66b5539cbd879aadb85261ba33 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Doc: Fix various problems in Qt Quick Dialogs documentationTopi Reinio2013-05-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes the following things in .qdocconf: - CamelCase for project name (required for generating valid tags in example manifest file). - Proper selector for QML Types topic - Fix exampledirs to not pull in all the Qt Quick examples - Add examplesinstallpath to make Qt Creator see the examples Also fixes the paths in example docs according to changed exampledirs. Change-Id: If18f7b5a3160d85814d508e1cbfb7bdb1a002c54 Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| * Dialogs: Create directory structure for documentationCaroline Chao2013-05-289-17/+69
| | | | | | | | | | Change-Id: I5245a6931606673733130b1f168fddafe8def695 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-05-28120-471/+1296
|\| | | | | | | | | | | | | | | Conflicts: src/quick/doc/src/appdevguide/porting.qdoc sync.profile Change-Id: Iec5516c596c3eca60a3e6ceb1d45f2a7a1595c12
| * Package dialogs examples into a single executableShawn Rutledge2013-05-2812-41/+305
| | | | | | | | | | | | | | Introduced tabs and added the C++ boilerplate launcher. Change-Id: Ibb49a182e3928aba5dced097d5307eb7d1f4b42d Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
| * window and Screen example: new properties; splash screenShawn Rutledge2013-05-2820-304/+549
| | | | | | | | | | | | | | | | | | Demonstrates the new properties, how to make a splash screen, and how to make a standalone app with an icon. Combined the Screen info into this example too. Change-Id: I5b731539b39c55327f4e5b93860a880a35835896 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
| * Disable textureinthread example when threaded gl is not available.Gunnar Sletta2013-05-224-3/+67
| | | | | | | | | | | | Task-number: QTBUG-30077 Change-Id: I8b6e4b8a33819fe84c843e85d863b582cfd69439 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * Doc: Update references to QDeclarative* classesSze Howe Koh2013-05-151-2/+2
| | | | | | | | | | Change-Id: Ifbde8c1ccfc0c759da6f2204320b9170a04179eb Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| * Fix warnings in stocqt-example.Friedemann Kleint2013-05-142-12/+12
| | | | | | | | | | | | | | Task-number: QTBUG-31083 Change-Id: I97d429c1a30664373478636c6b066dbdcd2a46ee Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| * Doc: Make Qt Quick demos accessible from Qt documentationSze Howe Koh2013-05-0717-0/+248
| | | | | | | | | | | | | | | | | | | | | | Add screenshots and brief descriptions. Integrate source code into documentation. Create new group, "qtquickdemos". Change-Id: I92715b2cdd861b1ff2bdd28a640e63d2a220499e Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Doc: Fix some broken snippet pathsSze Howe Koh2013-05-0619-123/+123
| | | | | | | | | | Change-Id: Ib79bfbea402b86e26a503de47383522317ca906b Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Doc: Make the titles of example pages consistentSze Howe Koh2013-05-065-6/+6
| | | | | | | | | | | | | | | | | | | | Most of the example titles have either a "Qt Quick Examples -" prefix or a "Scene Graph -" prefix. Also fixed a typo ("Scenegraph" -> "Scene Graph") Change-Id: Ibeb25d88d1888be3fb004a9ad95dc7ccbfeed7e3 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Doc: Move full apps from "qtquickexamples" to "qtquickdemos"Sze Howe Koh2013-05-064-10/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | "qtquickexamples" is for illustrating code usage; "qtquickdemos" is for showcasing fully-functional apps. Renamed titles and screenshots to match the other demos. Also, attempt to make the descriptions sound more interesting. Change-Id: I2fb43c5d32f24159cd39564576d4ebd76b2cbeaa Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Add new Item.Screen properties to screenInfo exampleShawn Rutledge2013-05-041-34/+35
| | | | | | | | | | | | | | | | Also removed the rotation animation which doesn't seem useful. (On most platforms the content will auto-rotate anyway.) Change-Id: Ia6ca1046fc2162a13be5c26cbf5d2b698ffa2367 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
| * Doc: Move example docs related to QtQml under the correct moduleTopi Reinio2013-05-0340-16/+16
| | | | | | | | | | | | | | | | | | | | | | This change moves 'Extending QML' qdoc file and the tutorials from examples/quick to examples/qml, which is the correct location for them. Change-Id: I24bd9dfa75baaab7bc8efe08489f09a7b65d98a6 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| * Better handle GL errors in EtcTexture::bind().Michael Brasser2013-05-031-0/+6
| | | | | | | | | | | | | | | | | | The scenegraph as a whole does not typically do GL error checking. That means GL errors occurring elsewhere could cause the etcprovider to unload textures that loaded correctly. Change-Id: Ic8e0caa62dab50b391e226cf0a493bc7e357dc46 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| * Canvas: Do not apply transform to text twiceFrederik Gladhorn2013-05-031-3/+2
| | | | | | | | | | | | | | | | | | | | The path already has the transform, no need to apply it a second time manually. Task-number: QTBUG-30501 Change-Id: Iedcb2e2f85a1f9eeac8e6264e00536c43bf16ddb Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| * Fix MaskedMouseArea exampleFrederik Gladhorn2013-04-301-2/+2
| | | | | | | | | | | | | | Task-number: QTBUG-30916 Change-Id: Icc73118f8d129b6c1ef285fd7a35f7a9a8e04391 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Doc: Fix example path for Qt Quick scenegraph examplesTopi Reinio2013-04-292-2/+2
| | | | | | | | | | | | | | | | Base path (examples/quick) is now defined in qdocconf file, example docs need to adjust their paths for \example command. Change-Id: I18412c4adf73691903ee58c9a056b6a4998d4d6a Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Doc: Remove "qmldemos" groupSze Howe Koh2013-04-291-1/+1
| | | | | | | | | | | | | | | | | | The group is a remnant of Qt Quick 1, and currently only contains 1 member. Move it to the "qtquickexamples" group. Change-Id: I211b9b769274e139321760f4b52220449e03a6ad Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 15:18:30 +0000