aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick
Commit message (Collapse)AuthorAgeFilesLines
* Move the model classes from QtQuick to QtQmlAlan Alpert2013-01-2432-8730/+230
| | | | | | | | | | | | | | | | | | | | | | | | This is needed for proper support of non-GUI instantiators in QtQml. Only private C++ classes are affected. Aside from name changes, model classes now operate on QObjects instead of QQuickItems, leading to minor changes in the implementation of QtQuick classes using them. The old QML type names will still be registered in the QtQuick import for the forseeable future, but pointing to the new classes. The new QML types will be added in a second commit. Classes Affected: QQuickVisualDataGroup -> QQmlDataGroup QQuickVisualDataModel -> QQmlDelegateModel QQuickVisualItemModel -> QQmlObjectModel QQuickVisualModel -> QQmlInstanceModel QQuickChangeSet -> QQmlChangeSet QQuickListAccessor -> QQmlListAccessor QQuickListCompositor -> QQmlListCompositor QQuickPackage -> QQuickPackage (just moved for now) Change-Id: Ia19e630e53bfa9e5d459e289596cd11df1ea3930 Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-01-233-6/+11
|\ | | | | | | Change-Id: I1656c712dfe99bc37d8ff21caa4ea51c3b375952
| * QQuickImageProvider: fixed three \snippet pathsXingtao Zhang2013-01-211-3/+3
| | | | | | | | | | | | | | Change-Id: I289e61c7e3acc3d7047b2b26fae624900e076586 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Fix crash in PathViewTasuku Suzuki2013-01-181-3/+7
| | | | | | | | | | | | Change-Id: I259e7af1755ff9615782bbce03fc41ea1957cab3 Task-number: QTBUG-29176 Reviewed-by: Alan Alpert <aalpert@rim.com>
| * Merge "Merge branch 'release' into stable" into refs/staging/stableGunnar Sletta2013-01-177-7/+7
| |\
| * | PathCurve documentation: fix non-working example snippetTopi Reinio2013-01-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the contextType property in the example code that demonstrates using PathCurve with Canvas; without it the code doesn't work. Task-number: QTBUG-29114 Change-Id: I75be931d5a30a26efceb2c2493f5e41d092dbbc5 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* | | Complete rewrite of threaded render loop.Gunnar Sletta2013-01-1817-1168/+1279
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change starts using the superior implementation of the scene graph render loop which has been worked on in the scenegraph-playground project for a while. It uses a far more straightforward locking/sync paradigm compared to the existing one and is less deadlock and error prone. It also enables the scene graph thread to run on its own when the GUI thread is blocked, enabling threaded animations. This changes also introduces a naming change inside Qt Quick from "Window Manager" -> "Render Loop" as that fits better to what the code does. Change-Id: I1c2170ee04fcbef79660bd7dae6cace647cdb276 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | | Merge branch 'stable' into devGunnar Sletta2013-01-17495-739/+984
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: src/qml/doc/qtqml.qdocconf src/quick/doc/qtquick.qdocconf Change-Id: I087fa14720995a5e53c43567dc4a3c29eb9992a9
| * | Merge branch 'release' into stableGunnar Sletta2013-01-177-7/+7
| |\ \ | | |/ | |/| | | | Change-Id: I88ecd5f396ecd9a9c910108d1cca832a3087f1d8
| | * Exporting required symbols for Qt Quick DesignerThomas Hartmann2013-01-176-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These classes are used by qml2puppet. Qml2Puppet is an external process used by the Qt Quick Designer, that builds the interface between the designer and Qt Quick/QML internals. Qml2Puppet is responsible for emulation and rendering. The 2 in Qml2Puppet indicates that it is used for Qt Quick 2.0. This would be nice to have in Qt 5.0.1 to allow testing based on official packages. Also this helps early adaptors. QQmlTimer is used to disable timers. QQuickTextEdit and QQuickTextInput are used to disable the blinking cursor. QQuickBehavior is used to deal with behaviors. QQuickPropertyChanges and QQuickStateGroup are used to emulate states. QQuickTransition is used to disable transitions. Task-number: QTCREATORBUG-8572 Change-Id: I572707d93eda477df945976442efed32ef16df34 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| | * doc: Fix namespace version to 5.0.1 for qhp documentationSergio Ahumada2013-01-121-1/+1
| | | | | | | | | | | | | | | Change-Id: Id101dc3a7ab5d2552531b7ea1819e0f2be725989 Reviewed-by: hjk <qthjk@ovi.com>
| * | Enable sub-pixel anti-aliasing for default builds on WindowsEskil Abrahamsen Blomfeldt2013-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While ANGLE builds only provide the OpenGL ES2 APIs, it's still a desktop technology and we should default to using high quality anti-aliasing. Task-number: QTBUG-28782 Change-Id: Iefc764589e935899ead278cedef4c302694dd2bb Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| * | Greatly improved Scene Graph Overview documentationGunnar Sletta2013-01-1611-100/+292
| | | | | | | | | | | | | | | Change-Id: I86b6bb9007d268ec039614a1693ecd839901e6d9 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * | Fixing a mistake in the GridView documentationFabian Bumberger2013-01-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The item size of the GridView is solely determined by the cellHeight and cellWidth property. I.e. the GridView will not resize the cells based on the root item size of the delegate. Change-Id: I007e4b1719d78ebf126d166c89bfe6c64e2206f7 Reviewed-by: Alan Alpert <aalpert@rim.com>
| * | Doc: correcting typo "the the"Nico Vertriest2013-01-145-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-28756 Spurious repetition of the definite article Doc: corrected trailing space issue. Change-Id: I95c1c5773dc4b25dd0a3625343a67975783435fd Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
| * | Update copyright year in Digia's license headersSergio Ahumada2013-01-10493-493/+493
| | | | | | | | | | | | | | | | | | Change-Id: I6c3bd7bebe3d62d1cfd0fa6334544c9db8398c76 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * | Fix PinchArea stealing events while disabledOleg Shparber2013-01-091-1/+1
| | | | | | | | | | | | | | | Change-Id: I8614431f11fc9ef1ecdbdeb1d37e4f4b1bb353a7 Reviewed-by: Alan Alpert <aalpert@rim.com>
| * | Doc: Updated docs for examples and etcXingtao Zhang2013-01-0910-112/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Corrected several \snippet paths and \example paths. - Added missing example images. - Marked several commands as code. - Updated the exampledirs variable for qtqml. Done-with: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Task-number: QTBUG-28898 Change-Id: I24aac17821f54de4bd5129c45b5bf96dc0f114b2 Reviewed-by: Liang Qi <liang.qi@digia.com>
| * | Fix bug where a tap over stacked mouse areas generates a double clickDaniel d'Andrada2013-01-092-5/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You have two mouse areas, one on top of the other. 1 - You tap the top one. 2 - That top mouse area receives a mouse press event but doesn't accept it Expected outcome: 3 - the bottom mouse area gets clicked (besides press and release mouse events) Bogus outcome: 3 - the bottom mouse area gets double clicked. Change-Id: I10cac52b5e8edea781fe88e70c4092eb38bcf763 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| * | Flickable: Fix bug when flicking twice using touchesDaniel d'Andrada2013-01-091-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When you flick twice in rapid succession, in the same direction, the expected behavior is for flickable to be moving quite fast in the direction of the flicks. But when you flicked using touch events instead of mouse ones, the second flick caused Flickable to immediately halt. This change fixes it. Change-Id: I02bd02fed30bd4a98959194e04f0a26b4420cd05 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
| * | Fix warnings about nonexistent signals in QQuickScreenOleg Shparber2013-01-091-10/+2
| |/ | | | | | | | | | | | | | | | | | | On application exit QQuickScreen tries to disconnect from an old QScreen which is almost destroyed at this point. Change-Id: I6c595cf68d6faaf3527b8ffcae0a074c23170ea1 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Alan Alpert <aalpert@rim.com>
| * Don't try to grab Windows with invalid or a zero sizeDominik Holland2013-01-081-0/+3
| | | | | | | | | | | | | | | | | | | | | | It will end up in LiveLock trying it. Because the Window will never appear in the Rendering thread and setting the grabContent. On the other end, grabWindow will never return because it waits for the RenderingThread to set grabContent Change-Id: Ia1c365acf033732b3e2e9d9d7dc8e73f9e8f4870 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| * Documentation for scene graph examples.Gunnar Sletta2013-01-071-0/+23
| | | | | | | | | | Change-Id: Idb39fc0b6d5e538b90ae8a0b98d9f4d77e1fb617 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| * Accessibility: Send value updatesFrederik Gladhorn2013-01-042-0/+10
| | | | | | | | | | Change-Id: I090dc8427e478416bf1bbe910db1f98d9bce3fb8 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* | Do not force focus for non-focused windows.Gunnar Sletta2013-01-171-8/+2
| | | | | | | | | | | | | | | | | | | | If a QQuickWindow comes to screen but is not the focus window, such as if it is a child window of another window, it should not have focus by default. Change-Id: If9015bbc179bb101178b3bc8de176a1c71c46023 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* | Disable blending of opaque Rectangle elementsGunnar Sletta2013-01-171-0/+3
| | | | | | | | | | Change-Id: If456248c10c24c3d2f2a383f29e72c74d2dee8bf Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
* | Bump Qt version to 5.1.0Frederik Gladhorn2013-01-151-5/+5
| | | | | | | | | | Change-Id: I9491f506aca249511c1eb3ad3baf44f4e4e65a9a Reviewed-by: David Faure (KDE) <faure@kde.org>
* | Filter key press events through shortcut map.Frederik Gladhorn2013-01-141-0/+6
| | | | | | | | | | | | | | This allows QQuickItems to use shortcuts. Change-Id: I068109a954d92e4e7bd5e63d2b3523b66855c60a Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | Deinline QQuickKeysAttached::keyToSignal.Robin Burchell2013-01-082-21/+22
|/ | | | | | | | This also means we don't need to expose the SigMap struct or value - it can be made file-local. This isn't performance-critical, so it shouldn't really matter. Change-Id: I08d48df4f903df49a6ea58e6f10f3f53a97d89de Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
* Bump Qt version to 5.0.1Sergio Ahumada2012-12-231-4/+4
| | | | | Change-Id: I8cadaec38aff1348c80c552e7fe072b6a7aa31b1 Reviewed-by: Alan Alpert <aalpert@rim.com>
* Fix other warnings in qtdeclarative found by GCC 4.7Thiago Macieira2012-12-235-4/+7
| | | | | | | | | | | | | qml/qml/qqmlimport.cpp:982:30: error: unused parameter 'errors' [-Werror=unused-parameter] quick/util/qquickanimationcontroller.cpp:66:6: error: unused parameter 'job' [-Werror=unused-parameter]' quick/items/qquickshadereffectnode.cpp:160:17: error: case value '38' not in enumerated type 'QVariant::Type' [-Werror=switch] quick/items/qquickwindowmanager.cpp:286:60: error: 'renderTime' may be used uninitialized in this function [-Werror=maybe-uninitialized] quick/items/qquickitem.cpp:5267:67: error: comparison between signed and unsigned integer expressions [-Werror=sign-compare] and a few more repeated from the above Change-Id: Id1950c6ba98f7f8475975716b21bd795ecb4bd20 Reviewed-by: Alan Alpert <aalpert@rim.com>
* Compile with QT_NO_WHEELEVENT.Volker Krause2012-12-199-1/+21
| | | | | | | | Change-Id: I2fbe6f45ba50e3db75bd02cfca47ddabfcd5fc49 Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Accessibility: Improve interface handling in QuickFrederik Gladhorn2012-12-193-8/+31
| | | | | | | | | | | | | | | | | | This changes how interfaces are handled: the QAccessibleQuickItem will simply subclass all interfaces and dynamically return 0 or the appropriate interface_cast. This makes our implementation a lot more flexible. To make use of the value interface, only a value property is needed (together with a corresponding role). Since the implementation of the interfaces became simpler, the value interface and some text interface improvements go along with the change. Change-Id: I003ec3016d48d730a4acac467bce322167842f4d Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* remove some unnecessary CONFIG additionsOswald Buddenhagen2012-12-161-2/+0
| | | | | | | | qt is already added by spec_pre.prf, warn_on by default_pre.prf and dll by qt_module.prf. Change-Id: I449e49275622bac39b7d76af8855c417ddce21e9 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add a hidden XandYAxis enum valueAlan Alpert2012-12-154-5/+5
| | | | | | | | | For Qt 5 XandYAxis is being renamed to XAndYAxis to more consistently follow capitalization rules. Add an undocumented XandYAxis variable to ease porting. Change-Id: Id9e41dd5578373f5f557937da889a9326ff12e53 Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
* Fixed samegame tutorial part 4 to reflect Quick2 stateOliver Wolff2012-12-141-2/+2
| | | | | | Change-Id: I61a3d63bc0268256ff6497339a6d97719a59860f Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Update porting docsv5.0.0-rc2Alan Alpert2012-12-121-1/+10
| | | | | | | | | | | Some improvements to the QML engine in Qt 5 lead to behavior changes. These should be explained in the porting guide. Task-number: QTBUG-28411 Change-Id: Ifc4016cf7b33ba113dbe0cbabd2f71a4ff1a8685 Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Bea Lam <bea.lam@jollamobile.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Change virtual folders in .qdocconf to qtqml and qtquickhjk2012-12-121-1/+1
| | | | | | | This seems more in line with the rest of the qdocconf files Change-Id: I91999205b0632a2c0e57f428754cf5928a1ea6c7 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Work towards supporting front-to-back reordering of opaque items.Michael Brasser2012-12-122-10/+9
| | | | | Change-Id: Ic3b9defa6ac61409adcfb2b5cb8167698ed00255 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Fixed abstractitemmodel exampleOliver Wolff2012-12-121-1/+1
| | | | | Change-Id: I1e85fd3f35f4f3d80e3fb599ae95b771db5f949b Reviewed-by: hjk <qthjk@ovi.com>
* Improved the scene graph overview a bitGunnar Sletta2012-12-111-9/+48
| | | | | Change-Id: I82f5a48801b2c8ed94ef1f8d0b2e82998bb91c78 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* centralize and fixup example sources install targetsOswald Buddenhagen2012-12-103-4/+4
| | | | | | | | follow respective change in qtbase Change-Id: I27502eb7ebea973e19ec5f7c3ec0e2338556f6e0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
* Don't generate duplicate doc pagesPaul Olav Tvete2012-12-101-4/+0
| | | | | | | Cross-linking works now, so we don't need the old hack anymore. Change-Id: I7d413788f643a75f3407f7186f5e1bdc9ed972a6 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fix doc links to submodelsPaul Olav Tvete2012-12-101-4/+4
| | | | | Change-Id: I2c65a77ca9c5fa1df1f0ff2ea67655e9ce1b0039 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 09:39:51 +0000