aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove QT_{BEGIN,END}_HEADER macro usageSergio Ahumada2013-01-28216-833/+0
| | | | | | | | | | | The macro was made empty in qtbase/ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb and is no longer necessary or used. Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html Change-Id: Ia07e99676e0134fde5e32880edb95e57c779a7ff Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Alan Alpert <aalpert@rim.com>
* Added an example of the window container embedding a QQuickViewGunnar Sletta2013-01-256-0/+285
| | | | | Change-Id: I451716f4a0eac2020835a9e8a0d67626b981c736 Reviewed-by: Alan Alpert <aalpert@rim.com>
* Move the model classes from QtQuick to QtQmlAlan Alpert2013-01-2446-1477/+1520
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* Move ListModel and ListElement to the QtQml importAlan Alpert2013-01-2431-282/+281
| | | | | | | | | | | | They're already in the QtQml module, but were left in the QtQuick import because they were considered to be of minimal use without QtQuick types. QtQml types are being developed would could make ListModel useful without QtQuick, indicating that they should no longer be considered QtQuick depedent. Change-Id: I31499f2cc23baf4bc70fb451ba164408bed89ff6 Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
* Refactor QQmlTypePrivateAlan Alpert2013-01-242-92/+169
| | | | | | | | Now has a registrationType, and an extraData union for data only relevant to certain registration types. Change-Id: I9b127dff7955456aacb25138fa6ea8efb7bb9220 Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵David Faure (KDE)2013-01-2310-27/+61
|\ | | | | | | refs/staging/dev
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-01-2310-27/+61
| |\ | | | | | | | | | Change-Id: I1656c712dfe99bc37d8ff21caa4ea51c3b375952
| | * Stabilize QQuickTextEdit testFrederik Gladhorn2013-01-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tst_qquicktextedit::remoteCursorDelegate was failing because the test server served the the remote file too fast. It seems like the test relied on a slow machine to run it. Instead pass the Delay option to make the server serve the file delayed. Change-Id: Id99feea07f2da3b2ea0aa6c07e9b548e8f81f18b Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| | * 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>
| | * Clean up accessibility QtQuick exampleTopi Reinio2013-01-214-20/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | Remove an undefined value (column.h) used in the accessibility example and fix minor indentation and style issues. Task-number: QTBUG-29225 Change-Id: I118ca7ee4fd24a3e94eb9b39e60514314ddcd7f0 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * Fix crash in PathViewTasuku Suzuki2013-01-183-3/+27
| | | | | | | | | | | | | | | | | | 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-1712-18/+33
| | |\
| | * | 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>
* | | | Move documentation to QtQml moduleAlan Alpert2013-01-233-17/+17
|/ / / | | | | | | | | | | | | | | | | | | | | | The recent move of certain elements from the QtQuick module forgot to update the module in some of the documentation strings. Change-Id: I5da27772004c7ceeb9c5ab6184e0078ac64ba07a Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | | Fix import path of TextBallon-example.Friedemann Kleint2013-01-231-1/+1
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-28144 Change-Id: Ic20fa242137a08e43b0685ebe701def929028647 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | | Complete rewrite of threaded render loop.Gunnar Sletta2013-01-1825-1374/+1543
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-172218-2784/+8415
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: src/qml/doc/qtqml.qdocconf src/quick/doc/qtquick.qdocconf Change-Id: I087fa14720995a5e53c43567dc4a3c29eb9992a9
| * | Merge branch 'release' into stableGunnar Sletta2013-01-1712-18/+33
| |\ \ | | |/ | |/| | | | Change-Id: I88ecd5f396ecd9a9c910108d1cca832a3087f1d8
| | * Avoid race condition in QQuickTestsGunnar Sletta2013-01-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QQuickView::show() function may or may not be synchronous and because the rendering happens on another thread, the frameSwapped can be emitted before we enter the qWaitForSignal() event loop. Fix this by waiting for the window to become exposed instead, which implies that it has rendered at least one frame. Change-Id: I1100a6fe981018395bf141d67f06adb94a354206 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| | * Exporting required symbols for Qt Quick DesignerThomas Hartmann2013-01-177-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * Update changes file for 5.0.1 releaseSergio Ahumada2013-01-121-7/+21
| | | | | | | | | | | | | | | Change-Id: I704cc948c37af639d9686c783a5341e2ab89903e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| | * doc: Fix namespace version to 5.0.1 for qhp documentationSergio Ahumada2013-01-122-2/+2
| | | | | | | | | | | | | | | Change-Id: Id101dc3a7ab5d2552531b7ea1819e0f2be725989 Reviewed-by: hjk <qthjk@ovi.com>
| | * test examples only in developer buildsOswald Buddenhagen2013-01-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | we don't want to actually build examples in production builds any more, so the test is bound to fail. Change-Id: I9adda2d147a05eb7acb3a864c81b8d0c0333c8bb Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * Merge branch 'stable' into releaseSergio Ahumada2013-01-0989-472/+1152
| | |\ | | | | | | | | | | | | Change-Id: I44631ce9d9a6aba090d01911ff62b56043510c9c
| | * | point dependencies to 'release' branchesSergio Ahumada2012-12-181-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iac26a66556eed1428a36cf7288167594a67e3590 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@digia.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>
| * | | Improve the look and feel of our demo launcherJens Bache-Wiig2013-01-175-14/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The existing demo launcher looks rather ugly. This does some visual tweaks to make it look better, including adding support for proper text wrapping. It was approved by our design lead Diana. Change-Id: I660764575a411f598c53c9c42e290a807e20c0cf Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * | | Greatly improved Scene Graph Overview documentationGunnar Sletta2013-01-1611-100/+292
| | | | | | | | | | | | | | | | | | | | Change-Id: I86b6bb9007d268ec039614a1693ecd839901e6d9 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * | | Remove workaround for particle shader on BlackberryFabian Bumberger2013-01-162-10/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibcf4b55323046fee4a18b4c5bf51c78ed8832a63 Reviewed-by: Alan Alpert <aalpert@rim.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>
| * | | Silence compiler warnings in qaccessiblequickitem.h.Friedemann Kleint2013-01-141-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduced by c8ef32e2b6cded37a6854b94a281464c1b7a298b. Change-Id: I654009b38f0169254c05398468d4fe4c2737dd5b Reviewed-by: Alan Alpert <aalpert@rim.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * | | Doc: correcting typo "the the"Nico Vertriest2013-01-1410-37/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-102186-2188/+2188
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6c3bd7bebe3d62d1cfd0fa6334544c9db8398c76 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * | | tst_bic: Add test data for linux-gcc-ia32Sergio Ahumada2013-01-101-0/+4622
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-321 Change-Id: I40505af8c579710c3252c9680287eda86bfbf165 Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
| * | | make use of qtHaveModule()Oswald Buddenhagen2013-01-1015-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I23f11c944fafb5863a960dcc83bc1e57e189f662 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@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-0930-239/+246
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
| * | | Test case for tapping on stacked mouse areasDaniel d'Andrada2013-01-092-0/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shows bug where the bottom mouse area could get a double click event out of a single tap. Change-Id: I4907a1506db2b4ccc5299d698c6e05fd02db963c Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| * | | Flickable: Test case for flicking twice using touchesDaniel d'Andrada2013-01-092-0/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. This test check for a bug where when you flick using touch events instead of mouse ones, the second flick causes Flickable to immediately halt. Change-Id: I430515d82499b904a1d2e23402b753873490a2d9 Reviewed-by: Andras Becsi <andras.becsi@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>
| * | Fix tst_qquicktextinput on Windows and Mac.Friedemann Kleint2013-01-071-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both require a sensible window size. Task-number: QTBUG-23485 Task-number: QTBUG-28611 Change-Id: If888dd4d60fccdabc9856f914d6542ced6a41d64 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
| * | Documentation for scene graph examples.Gunnar Sletta2013-01-0713-68/+484
| | | | | | | | | | | | | | | 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>
| * | Modify qmlscene usage text to be consistentRichard Moe Gustavsen2013-01-041-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | - last line was not aliged correctly with the previous lines. - usage of capital letter was inconsistent. Change-Id: Ied7caab8296a635e105764bc2e95aa9e78f1cfcb Reviewed-by: Alan Alpert <aalpert@rim.com>
| * | Accessibility: Work with QQuickWindowFrederik Gladhorn2013-01-044-29/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before we would only be accessible when QQView was used. While the window has the content item, that one will not appear in the hierarchy of accessible objects since it has no valueable properties to expose. Instead it's first child will be used (which was the case before when QQView was used). Change-Id: I03cefb5c8dcd8296d51ff2bfcb677386a5f1d698 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
| * | Improve example with key navigation.Frederik Gladhorn2013-01-044-31/+101
| | | | | | | | | | | | | | | | | | | | | Generally this is a redo of many of the details. Change-Id: I08c4f58966507232220bb10892041b9e39d54e37 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* | | Do not force focus for non-focused windows.Gunnar Sletta2013-01-176-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 16:44:24 +0000