aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quick/quick.pro
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-191-0/+1
|\ | | | | | | | | | | | | | | | | Conflicts: src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp src/qml/jsruntime/qv4engine.cpp src/qml/jsruntime/qv4engine_p.h Change-Id: I89ffccd699bee675732758d039e22224b275d60d
| * actually build the textureprovider exampleOswald Buddenhagen2016-05-131-0/+1
| | | | | | | | | | Change-Id: Idef70d65e6871fa995e680565424056c4caf4411 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | Move QtQuick.Layouts to qtdeclarative from qtquickcontrolsJan Arve Saether2016-02-261-0/+1
|/ | | | | | | | This is in order for it to be available without having to install Qt Quick Controls Change-Id: I3f0d0dc108829947cd189b7861944e556e00cef3 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Add QQuickAsyncImageProviderAlbert Astals Cid2015-03-261-0/+1
| | | | | | | It allows for providers to implement threading on their side Change-Id: I34042b213ce7697a3e39470387357d733e15723c Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* Make QQuickRenderControl publicLaszlo Agocs2014-06-241-1/+2
| | | | | | | | | | | | QQuickRenderControl allows rendering Qt Quick 2 scenes into framebuffer objects which can then be used in arbitrary ways in Qt-based or 3rd party OpenGL renderers. [ChangeLog][QtQuick] Introduced QQuickRenderControl as a public API. Task-number: QTBUG-37944 Change-Id: I84262243b261b35cefdf67ec6bba8127a0f29275 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Add dependency check for quickwidgetsZhang Xingtao2014-04-291-2/+2
| | | | | | | | | | If not, there will be an error when building with -no-opengl option: "Project ERROR: Unknown module(s) in QT: quick-private" The quickwidgets module depends on qt quick module, and qt quick module depends on opengl. Change-Id: If74b5582bdd96ed19ec10dbc534d02146717bc08 Reviewed-by: Liang Qi <liang.qi@digia.com>
* Move Qt Quick Widgets example and document itTopi Reinio2014-03-141-1/+2
| | | | | | | | | | | | | | | 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>
* Merge remote-tracking branch 'origin/stable' into devSimon Hausmann2014-02-111-1/+0
|\ | | | | | | | | | | | | | | | | 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-061-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | remove QtQuick.Dialogs and related modulesShawn Rutledge2014-01-071-1/+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>
* Add support for external drag and drop in Quick items.Chris Meyer2013-09-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Doc: Renamed accessibility example to "quick-accessibility".Jerome Pasion2013-08-131-1/+1
| | | | | | | | -Generated HTML file name conflicted with accessibility group. Task-number: QTBUG-32580 Change-Id: I5f5a4bb8134268c58105ea61d5ae3bbdd35c0d50 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Package dialogs examples into a single executableShawn Rutledge2013-05-281-0/+1
| | | | | | | Introduced tabs and added the C++ boilerplate launcher. Change-Id: Ibb49a182e3928aba5dced097d5307eb7d1f4b42d Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Added an example of the window container embedding a QQuickViewGunnar Sletta2013-01-251-0/+5
| | | | | Change-Id: I451716f4a0eac2020835a9e8a0d67626b981c736 Reviewed-by: Alan Alpert <aalpert@rim.com>
* Move examples aroundAlan Alpert2012-12-111-1/+3
| | | | | | | | | | imageprovider is a QtQuick example. Models and Views examples are now split up, as one is a collection of C++ examples and the other is banded into a single QML example. Task-Number: QTBUG-24133 Change-Id: I81874871bd69ffef6a88df84f3d3f649e0c56bc6 Reviewed-by: hjk <qthjk@ovi.com>
* centralize and fixup example sources install targetsOswald Buddenhagen2012-12-101-5/+9
| | | | | | | | follow respective change in qtbase Change-Id: I27502eb7ebea973e19ec5f7c3ec0e2338556f6e0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
* Fix installation of examples.Christian Kandeler2012-11-221-0/+5
| | | | | | | | | | Enable examples to be built in the target tree. This entails installing the project files and possibly other missing stuff. Task-number: QTBUG-27977 Change-Id: I159fd8e3ebc7077e1d68e085c4947acc058ce594 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: hjk <qthjk@ovi.com>
* Three scene graph examples with docs.Gunnar Sletta2012-08-131-0/+1
| | | | | | | | How to make a custom QSGGeometry, how to use QSGSimpleMaterial and how to use render with raw GL. Change-Id: I3e5a32b6ae12d7d781c11050ed26a54845e92cca Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* More consistent examples directory structureAlan Alpert2012-08-101-3/+2
| | | | | | | | Under examples the next directory level distinguishes imports/modules and the next directory level distinguishes examples. Change-Id: Icabadaac6ccb9c1c424efa9c9e64a7d94bc7c0da Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Uncomment examples in pro fileAlan Alpert2012-08-091-12/+12
| | | | | | | | Examples all seem to build and install fine, and no task number was mentioned in the pro file. Change-Id: Ie836385683287467618749456247684456721866 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Update model view examples to common launcher format.Andrew den Exter2012-03-221-2/+2
| | | | | | Change-Id: I8dc30a9ade3cbbfa91d51d85617975ad7d46ee15 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Merge master <-> api_changesMatthew Vogt2012-03-051-0/+17
Change-Id: Iad2f07b989b25349fd2d4fff010e24dcd5a1688f
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 11:34:22 +0000