aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quick
Commit message (Collapse)AuthorAgeFilesLines
...
* Set font correctly in canvas example.Mitch Curtis2014-04-081-1/+1
| | | | | | | | | | | This fixes the following warning: Context2D: Missing or misplaced font family in font string (it must come after the font size). Task-number: QTBUG-38103 Change-Id: I0902e6e095fb76cdc8619229dccf2601007c3216 Reviewed-by: Jeff Tranter <jtranter@ics.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Make example work when QOffscreenSurface == QWindowGunnar Sletta2014-04-023-36/+47
| | | | | Change-Id: I7435d91b37a46c0bced301c5c9c82fdf499e0587 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* Maroon example: use multimedia for audio; mute when inactiveShawn Rutledge2014-04-012-2/+2
| | | | | | Task-number: QTBUG-37742 Change-Id: If1a6ded9ccdaa4cd6f5e6e405e2d5caa21710d4c Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* Fix reading of shader sources in scene graph examplehjk2014-03-273-32/+8
| | | | | | Task-number: QTBUG-33080 Change-Id: I9219233ab7c7fbe89c0a9f1453d7c6aeeca498a1 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Fix typo in calqlatr example doc.Mitch Curtis2014-03-251-1/+1
| | | | | Change-Id: I2c51ea35af7de4a2152840ebf3bfb64ec2ed8d89 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fix some documentation errors.Friedemann Kleint2014-03-242-4/+4
| | | | | Change-Id: I5d4b3e26742202c4b634d0001fd3658c7263c50a Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Add surface format to QQuickWidget.Laszlo Agocs2014-03-181-0/+7
| | | | | Change-Id: Id72a042588e37832a0d3757bad935c531ef8275a Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Move Qt Quick Widgets example and document itTopi Reinio2014-03-149-1/+223
| | | | | | | | | | | | | | | Because QtQuickWidgets is part of Qt Quick module documentation, its examples need to also be moved under the examples/quick directory structure. This change moves the example, creates minimal documentation for it, and adds a link to it from the QQuickWidget class reference. Task-number: QTBUG-37272 Change-Id: Iffb67849f150b9aaf0edaef5852364e93f7752b8 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add some error handling to the QWindowContainer example.Friedemann Kleint2014-03-051-13/+59
| | | | | | | | | Use a QMainWindow and display errors occurring during loading QML as well as scene graph errors (for example, failure to create an Open GL context) in the status bar. Change-Id: Id9cf190e8a4f40de0f18ab081e2747135221bb88 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* Fix some typosSergio Ahumada2014-03-033-3/+3
| | | | | Change-Id: Iea540b768232ea423ea7f04e41655198931cf36d Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Merge remote-tracking branch 'origin/stable' into devSimon Hausmann2014-02-1145-2352/+36
|\ | | | | | | | | | | | | | | | | Conflicts: src/qml/compiler/qv4ssa.cpp src/qml/jsruntime/qv4arrayobject.cpp src/qml/jsruntime/qv4context.cpp Change-Id: Ied5b23bec4dc14abe51127c507aed668f855c1e1
| * Doc: Merge duplicated example directoriesSze Howe Koh2014-02-0643-2331/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | examples/quick/customitems contains all the examples found in examples/quick/ui-components, plus 2 more (maskedmousearea and painteditem). There are some very minor differences between the duplicated files, regarding the "smooth" property. Apart from that, the examples are identical. The only file that is unique to examples/quick/ui-components is example-slideswitch.qdoc. Moving it does not change the generated HTML filename. The other examples do not produce any documentation. Change-Id: I507d9064a60fd1f3a1469c1e423d4c0a72c7dc41 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Improve Scene Graph - Simple Material example documentation.Mitch Curtis2014-02-061-11/+11
| | | | | | | | | | Change-Id: I5b77f7590c9f2cea9305014b8a9d4ab3a387eaa3 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
| * Avoid out-of-bound accesses in Qt Quick example codehjk2014-02-051-10/+15
| | | | | | | | | | | | | | Task-number: QTBUG-36197 Change-Id: I5545c36a1ce9ea6c2451c92e0e79f65e5ab26c68 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | fix whitespaceOswald Buddenhagen2014-01-2242-129/+129
| | | | | | | | | | | | | | remove trailing spaces and expand tabs Change-Id: Ieacb9d096b612c45d1a64700044c114d1f7522bc Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devSimon Hausmann2014-01-171-0/+1
|\| | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/imports/dialogs/DefaultFileDialog.qml src/imports/widgets/qquickqfiledialog.cpp Change-Id: I00de6dd05cb773f01254061d585a82c90b229acd
| * Fix some compiler warnings in tests and examples.Christian Kandeler2014-01-151-0/+1
| | | | | | | | | | Change-Id: Ia739c995005635caf6fd0bd4e495ed8567350e83 Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-102-1/+2
|\| | | | | | | | | | | | | Conflicts: src/qml/jsruntime/qv4managed_p.h Change-Id: I5da7ae9c87a539e42292f272d9e2b5faab619c9f
| * Fix some typos in documentation.Jeff Tranter2014-01-091-1/+1
| | | | | | | | | | | | | | | | | | Fix some spelling and grammatical errors in comments that show up in Qt documentation. No changes to code. Change-Id: I2d91518900c9b60ee8e8a8f549c88a1d50632b3d Reviewed-by: Nico Vertriest <nico.vertriest@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
| * Updated the code to resize the text box on window resizeVenu2014-01-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | Without the QQuickView resizeMode set to QQuickView::SizeRootObjectToView the text box control appears in the middle and blocks the squircle effect. Task-number: QTBUG-35584 Change-Id: Ib8fc40f087a44d05062e900c33b9de5a620d1cc5 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | remove QtQuick.Dialogs and related modulesShawn Rutledge2014-01-0712-975/+0
| | | | | | | | | | | | | | | | | | | | | | | | They are being moved to the QtQuick Controls repository (see change ba9ba084124403bd8930e29d8afcea9d64b6c0b6 in qtquickcontrols). This makes it possible to use QtQuick Controls in the implementation. [ChangeLog][QtQuick][Dialogs]Moved dialog implementations from qtdeclarative module to qtquickcontrols module due to dependencies Change-Id: I76d5b71b185dd14a188ea68f18bfec61b4bf2f41 Reviewed-by: Liang Qi <liang.qi@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-12-244-6/+7
|\| | | | | | | | | | | | | Conflicts: src/quick/items/qquickrectangle.cpp Change-Id: Ia40bc0f2f08b5be68e32eb1e1f118445d20e44fc
| * systemdialogs example: path to /tmp is different on WindowsShawn Rutledge2013-12-231-1/+1
| | | | | | | | | | | | Task-number: QTBUG-34100 Change-Id: Ic06ed2933b76704b1a298de826cbe6b8587fee76 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
| * Doc: Updated the image URLVenu2013-12-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | The existing HTTP url for logo.png was automatically redirected to an HTTPS url which fails without SSL. So updated the example to use different HTTP url. Also updated another image URL, which is invalid now. Task-number: QTBUG-35557 Change-Id: I793fc5ebda64b21f443da7db9ecda76ae951d5bf Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * QtQuick window example improvements: window size and DPI infoShawn Rutledge2013-12-182-3/+4
| | | | | | | | | | | | | | | | On high-resolution displays it's important to size the window so that the content will fit. Also show the DPI conversion for pixel density. Change-Id: Ie35852ecff0bb0ee5ab9b77c6c18e82cfc300448 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-12-161-1/+3
|\| | | | | | | | | | | | | | | | | Conflicts: src/quick/items/qquickitem.cpp src/quick/items/qquicktext.cpp tests/auto/quick/qquicklistview/tst_qquicklistview.cpp Change-Id: I0bc5786098193c2c40b6fd8905de75d90f6ed0cf
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-12-121-1/+3
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/qml/qml/qqmlcompiler.cpp Change-Id: I802731139d47c5b733dd805f7bf432d67d7331e1
| | * Fix binding loop in Maroon in Trouble QML demoTopi Reinio2013-12-041-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-35210 Change-Id: I44bd9f19acba5b59711aa4ca3d2b12c246afcc59 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Sebastian Wozny <swozny@blackberry.com>
* | | Add displayMarginBeginning/End to ListView and GridView.Martin Jones2013-12-113-0/+95
|/ / | | | | | | | | | | | | | | | | | | | | This allows displaying content outside the visible area of the view. [ChangeLog][QtQuick] Add displayMarginBeginning/End to ListView and GridView. Change-Id: Idf9b5a0cd34a781c9603a9ad98ea189754972ba1 Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
* | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-11-203-11/+8
|\| | | | | | | Change-Id: Id732233d56e8d1706f62ef7a153d4a471406c551
| * FileDialog example: remove setGeometry buttonShawn Rutledge2013-11-191-10/+0
| | | | | | | | | | | | | | | | | | This was more of a manual test than an example: it should be possible to set the geometry of widget-based and qml-based dialogs. Since it doesn't work for native dialogs let's not invite bug reports about it. Change-Id: I43cb97bff0af932268ae541e3f812fc17a1f76ae Reviewed-by: Liang Qi <liang.qi@digia.com>
| * examples/quick/window example: fullscreen is possible on OSXShawn Rutledge2013-11-151-0/+1
| | | | | | | | | | | | | | | | | | | | It's normally disallowed without the WindowFullscreenButtonHint. But if we're going to declare a value for flags, then we have to put back the Window type which would otherwise be there by default. Task-number: QTBUG-33607 Change-Id: Ibbd593b2648b98d37c7f70a0b9f96787b0a40f22 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Adapt Qt Quick 2 renderer to work with OpenGL Core ProfileSean Harmer2013-11-131-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The basic approach is to have the batched renderer create and bind a vertex array object if it detects we are using an OpenGL Core profile context. The VAO is bound for the duration of the QQ2 renderer's work cycle and unbound at the end so as to not interfere with any other VAO's a user may wish to use. All shaders have been copied and ported to be compliant with the GLSL 150 core specification which is the minimum for a Core profile context (OpenGL 3.2 Core). We are not using any newer features as yet so this will work anywhere we can get a Core profile context. The QSGShaderSourceBuilder class has been extended to resolve any requests for shaders to the same basefilename with "_core" appended prior to any file extension. This could be extended in the future to allow version, or GPU or platform specific shaders. The QSGShaderSourceBuilder has also been extended to allow it to insert #define definitions in the prologue of a shader. Any such definition is inserted: * After the last #extension directive (if any are found) * Otherwise after the #version directive (if found) * Otherwise at the start of the shader source This is required by the custom particle shaders which make extensive use of such #defines. In addition the mechanism used by the distance field glyph cache to extend the cache with new glyphs has been modified to work (and work more efficiently) when using a Core profile context. Rather than using a shader program and a buffer filling quad to blit the old texture into the new cache texture, we instead use the technique of framebuffer blitting. The existing fallback implementation using glTexSubImage2D() is still available if needed. The DECLARATIVE_EXAMPLE_MAIN macro has been extended to allow easy testing of any of the QtDeclarative examples with a core profile context. Just run the example with QT_QUICK_CORE_PROFILE=1 ./text for e.g. The only ones that may not work out of the box are those that provide GLSL shader source e.g. the customparticles or shader effect examples. These work fine if the shader source is adapted to GLSL 150 core. In the future it may be a good idea to expose some context property to QML that the user can use to determine what shader source variation to provide to Qt Quick. Along these lines it would also be very nice to allow the provision of shader source to ShaderEffect or CustomParticle from a separate source file just as we now do within Qt Quick. Task-number: QTBUG-32050 Change-Id: Ia6e9f06dbb8508af9ae03c6b60fb418b4cc9e41f Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * Polish up QQmlFileSelectorAlan Alpert2013-11-131-1/+1
| | | | | | | | | | | | | | | | Incorporate beta feedback, and hide QQmlAbstractUrlInterceptor as the implementation (instead of making that "the API"). Change-Id: Ib7b14afeb9205fb8a87ed16a6d38b1f468b2aaaa Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Respect device pixel ratio in "OpenGL under QML" example.Gunnar Sletta2013-11-141-1/+4
|/ | | | | Change-Id: I1b67acfdcdb1fb47593a6acd62ffd6c3315b5503 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Doc: Fix broken linksSze Howe Koh2013-11-053-3/+3
| | | | | | Change-Id: Ie7408409ddbaa354370267f2dd74326ec56a4186 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Replace Message attached property with gadget typesShawn Rutledge2013-11-051-21/+21
| | | | | | | | | This is a more efficient way to expose the StandardButton and StandardIcon enums. Change-Id: I9d0becf54be2a883d55c9eaeaf10b83b23e59f3c Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Doc: Fix warnings in StocQt Qt Quick demoTopi Reinio2013-11-044-10/+22
| | | | | | | | | | | | | Fix a number of warnings from QML engine by adding some boundary & sanity checks for properties. Also address UI update issues by having XMLHTTPRequest calls to trigger by a timer, instead of directly binding them to multiple change notifier signals. Task-number: QTBUG-33867 Change-Id: I48f573050b5dc3e3fe6e75bc423fe86ecc4a2469 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* QtQuick examples make use of the new pixelDensity propertyShawn Rutledge2013-10-303-3/+6
| | | | | Change-Id: I273fc08405724158fbf7c7d410bfa38fef4600b1 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Modify SameGame to use QML SingletonAntti Piira2013-10-2911-47/+121
| | | | | | | | | | Converts SameGame to use QML Singleton for storing global settings data that was previously stored in javascript files. In addition adds a BlackBerry specific selector to load a different singleton settings instance. Change-Id: If511e5efd0e539c764ab70eca4fb0f2874b6240e Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 19:24:48 +0000