aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick
Commit message (Collapse)AuthorAgeFilesLines
* QtDeclarative: Add qtlinguist to the doc dependecies.David Schulz2012-12-041-1/+1
| | | | | Change-Id: I1217b0df22a5f9111d22387a512d53ab0c176a17 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Doc: Edited qdocconfig files to change QCH titles and redirects.Jerome Pasion2012-12-031-8/+10
| | | | | | Task-number: QTBUG-28341 Change-Id: Iba37adc500794f18e90f0a9dd4a765a5c90d5e10 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* Qt Quick high-dpi support.Morten Johan Sørvig2012-12-012-3/+9
| | | | | | | | | | | | | | Set the device and viewport rect to the full device pixel size. Set the projection matrix to the device independent pixel size. Scale shader effect source texture sizes. Change-Id: I61dd546ff36a7ce6ad05f908796555674c714c1a Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Update SGNode after pixmap is invalidatedAlan Alpert2012-11-301-1/+1
| | | | | | | | | | If the QDeclarativePixmap on a previously valid Image is cleared, and the scenegraph updates before the networked pixmap request returns, the scenegraph can crash when trying to paint a now invalid texture. Task-number: QTBUG-27795 Change-Id: I83436f846a3e965b324ff6ebf057708fe8c3b82a Reviewed-by: Alan Alpert <aalpert@rim.com>
* Compile with QT_NO_VALIDATOR.Volker Krause2012-11-301-3/+3
| | | | | | | | Theses enums were apparently renamed for the case QValidator is present, so follow this here as well. Change-Id: Ic2a3fd5296a6dd9da356c2e5efd88f56d0843664 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* Compile with -no-feature-cursor.Volker Krause2012-11-301-0/+4
| | | | | | Change-Id: I47fa7b978a8087086161b1e7bde2e0b2f91fd6e5 Reviewed-by: Sérgio Martins <sergio.martins.qnx@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* Fix example lists for Qt QuickEskil Abrahamsen Blomfeldt2012-11-302-23/+13
| | | | | | | | | Snippets are fixed, the extending-examples are moved from QtDoc, groups are used to generate the lists and I've removed some unrelated stuff from the list of Qt Quick examples. Change-Id: I347b6fa8a29b1cede1164fa858488f34507e1a17 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Add calqlatr to qmldemos group and move qmldemos listEskil Abrahamsen Blomfeldt2012-11-301-75/+0
| | | | | | | | | | The qmldemos list has been moved to qtdoc, otherwise the links to the documentation for the demos (in qtdoc) doesn't work. Links from qtdoc to calqlatr in qtdeclarative works because that's the direction of the dependency. Change-Id: Ib275a9c7f009194a260b2e70278244afc1cedfaa Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Remove superfluous function callAlan Alpert2012-11-301-1/+0
| | | | | | | | Because we just set pixmapChanged, we're certain to update the texture in the next if block. Change-Id: I83436f846a3e965b324ff6ebf057708fe8c3b82b Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Move no-Gui related QML types from QtQuick into QtQmlTasuku Suzuki2012-11-298-1279/+0
| | | | | | | | | Task-number: QTBUG-26340 Change-Id: I9049128db2598bf3c7a9d677b774eaae53b54eb5 Reviewed-by: Alan Alpert <aalpert@rim.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Renamed QQuickItem::pos property to positionShawn Rutledge2012-11-2913-26/+25
| | | | | | | | | Abbreviated property names are less descriptive so we don't have many of them. Might as well be consistent. QWindow::pos was already renamed. Change-Id: Ib52673e68e7dc902b2f8942dba6b899074b2538b Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Warn about potential abuse of QQuickPaintedItem::paint().Gunnar Sletta2012-11-291-0/+3
| | | | | | Change-Id: I9908402b3ada90497070930d43eafd433276201f Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Fix mouse event distribution for Flickable with pressDelayMatt Vogt2012-11-293-67/+80
| | | | | | | | | | | | | | | | If an item responds to mouse events but does not accept them, it can prevent the events from being processed by the correct item further up the parent chain. For example, a text item inside a mouse area can wrongly consume a press event, so that the following release event does not yield a click when processed by the mouse area. Rather than speculatively assigning the mouse grab to items during event filter processing, change Flickable to retain the grab for the duration of the pressDelay and to release it during replay of the press event. Change-Id: Ied12b9643838a984c7026978047465c2830e55e4 Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
* Remove QML intro and QML Application Development pagesGunnar Sletta2012-11-282-1306/+2
| | | | | | | | | | | These are duplicates of the getting started document and the overviews listed in the "Important Concents of Qt Quick". They are also not accessible from the toplevel docs (because they are duplicates). Change-Id: I628d264a7738bb3b9efdaf04f3a3c1a3853688d6 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Remove superflous "defining reusable components" documentation.Gunnar Sletta2012-11-282-532/+1
| | | | | Change-Id: I73e6be5c7e5abe42ebf797ccfc7db5035ec4ec2c Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* docfix: Some of the scenegraph overview content did not make sense.Gunnar Sletta2012-11-282-15/+20
| | | | | Change-Id: Ib354e5f0a9f3c6e35eb8dabfb36e931f9ba4f255 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* docfix: Move image to correct locationGunnar Sletta2012-11-281-0/+0
| | | | | Change-Id: Id16d52de895bf48e29c565c84c7602318a90a85d Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Docfix: Move images to correct location and fix bugs in code sample.Gunnar Sletta2012-11-282-0/+0
| | | | | Change-Id: I7ec530f0e1a41051e31517e6fcac5eb691d1795d Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fix the QML Effects docs up a bitGunnar Sletta2012-11-274-60/+36
| | | | | Change-Id: I09226e8796be6a9785496192a5e3114d01e2ffd7 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Fix qdoc typoGunnar Sletta2012-11-271-1/+1
| | | | | Change-Id: I3527064168c44cb4909f183d4b6a5c804649d0bb Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Qt Quick (2) is not dependent on LGPL codeLars Knoll2012-11-271-5/+0
| | | | | Change-Id: I0cece9da63bce327d2d6bc2eb13d500bd054f12f Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Enable module build with QT_NO_IMTasuku Suzuki2012-11-2617-11/+277
| | | | | | Change-Id: I90f8ec7e6357db7b4038bb1646fe9d3835821556 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Alan Alpert (RIM) <aalpert@rim.com>
* Fix deployment docs.Lars Knoll2012-11-261-9/+13
| | | | | | | Qt Quick is not dependent on widgets. Change-Id: Icd7ab72d9558905ac6d3790faa0248b0d197ea8c Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* QQuickWindow cannot rely on QWindowPrivate.geometryShawn Rutledge2012-11-261-2/+3
| | | | | | | | | | because sometimes geometry has been set on the platform window and sometimes it's only stored in the QWindow geometry, waiting for the asynchronous confirmation. So it should call QWindow::geometry() instead. Change-Id: Ifa54792be31440108fae212240a46ae269393eb7 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Nested Flickables with pressDelay flick incorrect FlickableMartin Jones2012-11-261-0/+16
| | | | | | | | | | | If the gesture is triggered within the pressDelay the outer Flickable will always handle the gesture. When the drag distance is exceeded replay the press event to allow all Flickables an opportunity to process the gesture normally. Task-number: QTBUG-28189 Change-Id: I36912cc19a48c90ae7a9a430580a8f40071bd5fd Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
* Reduce number of relocationsMarc Mutz2012-11-232-4/+4
| | | | | | | ...by turning pointer into array variables. Change-Id: Ia5a0cedcf28d54210cc1f179db5c519e7e0672cc Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Support requestPixmap if platform has ThreadedPixmaps featureAlbert Astals Cid2012-11-232-8/+27
| | | | | | | | | As discussed with Samuel enable the use of requestPixmap in a thread for async requests if the platform support ThreadedPixmaps Task-number: 28138 Change-Id: I106cf0123430115464b0a75071c7e6129a98d22b Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Doc: Adding "qtgui" to the documentation dependency.Jerome Pasion2012-11-221-1/+1
| | | | | | | | -Qt Quick and Qt QML depend on Qt GUI and its documentation. Change-Id: Icf14107490bf7a884a5e5840d7ec7bdd62e1cf09 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Improved documentation of Text.textFormat property.Samuel Rødal2012-11-221-1/+5
| | | | | | | | Even though using RichText is not recommended, we should still at least point out what it does. Change-Id: I96d0e1e7074b5fdbb3a5dcaf84e5afe805c92080 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Add designer support for animations and componentCompleteMarco Bubke2012-11-223-1/+9
| | | | | | | | | In the designer animations confuse users, if you change a state or move a item around. Also component complete is called later by the designer. The call in the VME is to early. Change-Id: I49aa04edbc49fb44ddb7b52062307982865efd7e Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Expose QMatrix4x4 properties as mat4 uniforms in shadersChris Adams2012-11-221-0/+3
| | | | | | | | | | Previously, QMatrix4x4 properties were not exposed as uniforms in shaders. This commit adds conversion code for matrix 4x4 properties so that they are automatically converted to mat4 uniforms. Task-number: QTBUG-27952 Change-Id: I9b1de39fbbcb02743cf8c4e09b4d83c44f1dd438 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Ungrab mouse upon leave event.Frederik Gladhorn2012-11-211-0/+2
| | | | | | | | | | The event signals that the mouse has left the window. This happens also when a popup is shown (overlapping the original window). Before a mouse area would still think it was in pressed state when the popup (QWindow/QMenu) was shown and even after the popup was closed. Change-Id: I6d32571f5a473610f60e9476850989ff665edb93 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fix syncqt-warnings.Friedemann Kleint2012-11-204-5/+5
| | | | | | | Use include with module name in the public headers. Change-Id: I50d3767a5538bc3f935ebf61b56894c8f0461981 Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* Merge branch 'newdocs'Eskil Abrahamsen Blomfeldt2012-11-2025-7/+1206
|\ | | | | | | Change-Id: Idd7a9837e4f6a1358edf9accdcdc3c71822f4c25
| * Doc: Moved all content in the doc directory.Venugopal Shivashankar2012-11-0823-1/+1202
| | | | | | | | | | | | | | | | | | - most images to the corresponding examples directory - Fixed a few broken links to the examples and qdoc pages - removed the obsolete and unused images and qdoc pages Change-Id: I18f9551b42ec713b81e3f69694a2bd04b1ebf794 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
| * Merge branch 'master' of ssh://codereview.qt-project.org/qt/qtdeclarative ↵Jerome Pasion2012-11-0236-370/+527
| |\ | | | | | | | | | | | | | | | into newdocs Change-Id: Icced038fbdb309d8928213d3753a27fe5a6b1137
| * | Doc: Removed the HTML template from the .qdocconf filesJerome Pasion2012-10-291-2/+0
| | | | | | | | | | | | | | | | | | | | | -qt-module-defaults.qdocconf already contains the HTML template. Change-Id: I8ecac8e959d0fe8705295f4c9a58dd6b98ca1a44 Reviewed-by: Martin Smith <martin.smith@digia.com>
| * | doc: fix some typos.Alexandr Akulich2012-10-221-4/+4
| | | | | | | | | | | | | | | Change-Id: I951d89094a6d49e4c71aa9a50e98f3ccc1ca62e1 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* | | Allow margin changes during Flickable drag operationMatt Vogt2012-11-191-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the dimensions of the flickable were captured at mouse press and reused during dragging, which causes problems if the margins of the Flickable are altered during the drag. Adjust the captured values so that margin changes are correctly handled. Change-Id: I1ce608dcc1302ea8639bf18a81361b27749b217b Reviewed-by: Martin Jones <martin.jones@qinetic.com.au>
* | | Use threaded renderer even without BufferQueueingOpenGL.Samuel Rødal2012-11-161-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without threaded rendering QML 2 often ends up running at half the screen refresh rate on X11. Not having BufferQueuingOpenGL shouldn't prevent us from using threaded rendering, since the issue of four animating windows running at 1/4th of the screen refresh rate will happen regardless of whether rendering happens on the main thread or in a separate rendering thread. Change-Id: I0edc818e6d762fa1faf13e7f2f47dfda132b6fdf Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | | QuickTest: Remove reference to /tests/qmlautoKai Koehne2012-11-141-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | There's no tests/qmlauto in the source tree, neither could I find an example using QUICK_TEST_SOURCE_DIR. Task-number: QTBUG-27919 Change-Id: I5a4ba5653a06e448a922a47900ae3f2d12e3020c Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | | Deduplicate checking of conditions.Alexandr Akulich2012-11-121-2/+2
| | | | | | | | | | | | | | | | | | Change-Id: I0621db17db2bb8fe885a3a65f6a7a042279c3752 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | | Preparation for changing QWindow::windowState to visibilityShawn Rutledge2012-11-101-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | QQuickWindow needs to avoid depending on QWindowPrivate::visible. It can go back to using private variables after the replacment is done. Change-Id: I38b99df8b4ef0139c9eadcbb07d33d3f1894a8ac Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | | Examples and fixes for QML Window propertiesShawn Rutledge2012-11-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Setting Window.color in QML takes effect immediately. It was only possible to set the property at startup. Examples demonstrate new Window property features. Change-Id: Ic5b43d0d84371f3fe5c42223ccc98e6de27aed10 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | | Expose "Qt.application.supportsMultipleWindows".Samuel Rødal2012-11-092-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Useful on platforms like kms and eglfs that only support a single QWindow. On those platforms the QML application can thus choose to use a Rectangle instead of a Window to show dialogs etc. Change-Id: Idc3f46d2cad6cf3f55c5c84df2c8511407bd4849 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Alan Alpert (RIM) <aalpert@rim.com>
* | | Don't use design metrics with NativeRendering on TextInputEskil Abrahamsen Blomfeldt2012-11-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We only set the design metrics property in init(), before the renderType has been set. Since updateLayout() is called every time the renderType changes, it should be sufficient to set it there. Change-Id: If5b2cb3738e8135195848857a30f4e646bdf1d0b Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | | All QWindow properties that have "window" in them have been renamed.Shawn Rutledge2012-11-081-8/+27
| | | | | | | | | | | | | | | | | | | | | Depends on patch Ie4424ec15fbdef6b29b137f90a2ae33f173edd21 in qtbase. Change-Id: I9614cc2c7ed119c663b3f6f99267483e291e529c Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | | Prevent crash when doing threaded rendering of multiple windows.Samuel Rødal2012-11-082-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't call renderSceneGraph() on non-renderable windows. We also don't call syncSceneGraph() on them, which is where the renderer will be set. Also get rid of harmless warning about non-renderable windows. Change-Id: I24739abefe0d554efb568514057719f981590c28 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | | qmlscene can start with either an Item or Window as the qml rootShawn Rutledge2012-11-052-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, it assumed that the root is an Item and needs to have a Window created. But it's useful for an application to have a Window as the root, and it was already possible by writing a different C++ main function (see qtdeclarative/examples/window/window/window.cpp). It doesn't take much to give qmlscene this flexibility too. Change-Id: Ie808e78a42074e13aa9d3c87723ec9ac8fdbaf4a Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | | Fix a missing word in the docsJan Kundrát2012-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The functionality is "*no* longer available", of course. Change-Id: I2c9f2633d74b98c16216f68e3d7e080422cf6506 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>