aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* centralize and fixup example sources install targetsOswald Buddenhagen2012-12-10628-515/+404
| | | | | | | | follow respective change in qtbase Change-Id: I27502eb7ebea973e19ec5f7c3ec0e2338556f6e0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
* Only free context if the owning QV8ContextResource gets destroyedPhilip Lorenz2012-12-104-8/+59
| | | | | | | | | | | | | | | | | | Since fdeee38b781376012c4f086276c3c376726c8839 QQmlXMLHttpRequest stores the calling context for later use. This leads to issues after the first request completes and the wrapping QV8ContextResource gets freed by garbage collection and therefore removes the associated QQmlDataContext which may still be required for later calls (e.g. if the calling context is part of a stateless library). This patch introduces an ownership flag for QV8ContextResource which indicates if the associated context should be cleared when the object is destroyed. Task-number: QTBUG-28351 Change-Id: I552ebb5c55b889eb33f3884283c8fdf037ac33be Reviewed-by: Alan Alpert <aalpert@rim.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>
* Mark autotest as insignificant on macPaul Olav Tvete2012-12-101-0/+2
| | | | | | | | This test blocks unrelated changes from getting through the CI system. Task-number: QTBUG-28505 Change-Id: I514b449ddd4cfc7c4f2fdb011b8910838aeabac7 Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* Change qFatal to qWarningAlan Alpert2012-12-061-1/+1
| | | | | | | | | While the process should terminate immediately with a non-zero exit code on component error, it does that in the next line already. The main difference is dropping the backtrace, which is not useful in this case. Change-Id: I866ea00e62cb9d1b7c506b9819cd9bb2750ac81f Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* Stabilize tst_qquickpathviewAlan Alpert2012-12-051-3/+3
| | | | | | | | | The complete flick is already a long operation, so when it's delayed due to heavy system load it can exceed 5s easily. Increase the timeout to give the flick time to finish. Change-Id: I333c41ea432676a8c7f6de637f6af98203cd07fb Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Doc: Fix external referencesv5.0.0-rc1Christian Stenger2012-12-051-0/+2
| | | | | Change-Id: Icf5d6a6bcfe7ef15c6e8e66d94bdd59ae6dbc904 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Remove 'com.nokia' string from autotestAlan Alpert2012-12-0539-97/+97
| | | | | Change-Id: Ic318dbe7a48412e9689ca0f4506c7098d9f48b5e Reviewed-by: Christopher Adams <chris.adams@jollamobile.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>
* Use the qRegisterMetaType which does not take a string.Stephen Kelly2012-12-041-7/+7
| | | | | | | The string is redundant, not needed, and is at risk of containing typos. Change-Id: I692dba07a09d4cbe8dca6ac4ac1187070b2bf59a Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Declare QJSValue as a metatype where it is defined.Stephen Kelly2012-12-0417-27/+2
| | | | | | | Instead of in multiple different TUs, therefore causing ODR violations. Change-Id: I08d3624d3ed5a995e96488361665afa197fb9fc9 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Declare QQmlV8Handle as a metatype where it is defined.Stephen Kelly2012-12-044-4/+2
| | | | | | | Instead of in multiple different TUs, therefore causing ODR violations. Change-Id: Iefc5f3486961b91dd4e97a462f72570ff49bfd1b Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* sync.profile: Point dependencies to 'refs/heads/stable'Sergio Ahumada2012-12-041-3/+3
| | | | | | | | | | | | We should test stable branches against stable branches only. At some point we should automate the merges from dev->stable->release and decide how to handle possible merge conflicts. This is good enough for the time being. Change-Id: Idc68c5c4653375b1805638b80c2a9e8f5a2cacad Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* doc: Fix remaining snippet in qml-modelviews exampleEskil Abrahamsen Blomfeldt2012-12-041-1/+1
| | | | | | | The others were already fixed, but I missed this one. Change-Id: I4a53784b474a393877c4a65bd157b807e2d52939 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Avoid duplicating Qt Quick Code SamplesEskil Abrahamsen Blomfeldt2012-12-036-41/+40
| | | | | | | | | We can't include ../../.. in exampledirs, because then qtqml will include all in the whole repository and a bunch of them will be duplicated in qtquick and qtqml. Change-Id: Ib2b9776af0969baceb1e4907c79ce6cecf31f67e Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Doc: Edited qdocconfig files to change QCH titles and redirects.Jerome Pasion2012-12-032-17/+17
| | | | | | Task-number: QTBUG-28341 Change-Id: Iba37adc500794f18e90f0a9dd4a765a5c90d5e10 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* Resume testing of customparticleAlan Alpert2012-12-011-3/+0
| | | | | | | | Tests were suspended pending a fix for QTBUG-24034, which was fixed months ago. Change-Id: I903addc8cb1206073e8e1e1532dbabc6611060b4 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Docs: Fix some more referencesChristian Stenger2012-12-019-14/+20
| | | | | Change-Id: I9fa1337128d91527056e3bcd26e693a19ab68eff Reviewed-by: Jerome Pasion <jerome.pasion@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>
* Stabilize tst_qqmltimerAlan Alpert2012-12-011-28/+44
| | | | | | | | Use consistent timing on the unified timer instead of qWait Change-Id: I76c402081062f7f6849bd421e90bc96f08e8d959 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix QML XmlHttpRequest Insecure Redirection FlawRichard Moore2012-12-011-3/+5
| | | | | | | | | Fix the redirection flaw in QML's XmlHttpRequest implementation that is described in http://lists.qt-project.org/pipermail/announce/2012-November/000014.html Change-Id: Idfad4bc5dde6eda8840737c38e85568f3a4c0420 Reviewed-by: Lars Knoll <lars.knoll@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>
* Make static QQmlProperty::read() take a const QObject pointer.Andreas Hartmetz2012-11-302-9/+9
| | | | | | | | | | | It uses the QObject in a non-const, but still logically const, way internally. Given that the compiler disregards const for code generation and that the QObject won't change in any way observable from the outside, that should not be a problem. Task-number: QTBUG-28258 Change-Id: I1a852a2597eb2ff05b421e8024e70e7ac5299627 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>
* Qmltypes: Update plugins.qmltypesKai Koehne2012-11-301-31/+30
| | | | | Change-Id: I5388ece0f62a57566d7059077c88bb42e81b3238 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Fix example lists for Qt QuickEskil Abrahamsen Blomfeldt2012-11-3019-104/+433
| | | | | | | | | 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>
* Limit case-sensitivity check in QML to file names.Friedemann Kleint2012-11-303-7/+30
| | | | | | | | | | Provide for checking relative paths only; default to file names. Currently, the checking triggers on a drive letters and installation folder names, which is too strict. Task-number: QTBUG-28277 Change-Id: I1174bb0c485eeb1ffee10bb2a523d6629c57728b Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Remove the remaining usages of deprecated QWindow accessorsShawn Rutledge2012-11-302-2/+2
| | | | | Change-Id: I146e7b8e3ae0ee74f5f4e3ef85f59d50a639c0f5 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Add calqlatr to qmldemos group and move qmldemos listEskil Abrahamsen Blomfeldt2012-11-302-75/+1
| | | | | | | | | | 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>
* QmlPluginDump: Prevent crash if run without WMKai Koehne2012-11-301-0/+3
| | | | | | | | Make sure that the minimal platform plugin is used by default. Change-Id: I2362649dafaf823b00ab37519b516aef9ac3166b Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Made tst_QQmlDebugJS insignificant on Mac.Janne Anttila2012-11-301-0/+2
| | | | | | | | | | | | | | | | | | This test has been failing often on Mac. It seems that test case only fails with Qt5 master integration, but not with QtDeclarative CI. This test has now failed twice consecutive in virtualized Mac OSX machines. Since I'm going to add some more virtual Macs to CI tomorrow morning, making this test case insignificant to avoid good changes integrating in additional capacity. For more information, see the following bug report. Task-number: QTBUG-28263 Change-Id: I3492373f4f034c27fdbc207e395a40ef96dccbd9 Reviewed-by: Samuli Piippo <samuli.piippo@digia.com> Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@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-2952-307/+300
| | | | | | | | | 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-2927-153/+152
| | | | | | | | | 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>
* Make tst_examples::namingConvention not failKai Koehne2012-11-291-2/+8
| | | | | | | | | The test seems to be wrong. Keep the warning though if other tests actually rely on the behavior. Task-number: QTBUG-28271 Change-Id: I862fd442982021f26531f43b56b97f7c7b8c9c69 Reviewed-by: hjk <qthjk@ovi.com>
* Make FolderListModel available from the module overview.Gunnar Sletta2012-11-291-0/+15
| | | | | Change-Id: I19c9a28b290a2ed7b3edee18583b686abf97dec0 Reviewed-by: Paul Olav Tvete <paul.tvete@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>
* tr()-Fix: Do not use QObject::tr().Friedemann Kleint2012-11-291-3/+3
| | | | | Change-Id: I85eb3f429d273b69270817eb4e9f1c386b5cda20 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Apply full transformAlan Alpert2012-11-291-4/+7
| | | | | | | | | | | Previously the particle system was only applying the translaton of the relative transfrom from any emitters. Now the full transform is used. Task-number: QTBUG-25518 Change-Id: I4c654837c37dbef8f6f407387ce4ea82cb3b821c Reviewed-by: Martin Jones <martin.jones@jollamobile.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Fix mouse event distribution for Flickable with pressDelayMatt Vogt2012-11-296-90/+154
| | | | | | | | | | | | | | | | 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>
* Docs: Fix some reference errorsChristian Stenger2012-11-283-12/+10
| | | | | Change-Id: Idf616d765398fe694b203dde595347f642ce503e Reviewed-by: hjk <qthjk@ovi.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>
* Mark scarc resource docs as internal for 5.0Frederik Gladhorn2012-11-282-4/+16
| | | | | | Change-Id: Ic3e235399161dcf0c9a259a5e94b4178d61eb5cb Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix escape sequences in lexer: the capital X is not an EscapeCharacter.Erik Verbruggen2012-11-281-1/+0
| | | | | | | | | | The ECMA test suite has a test to check that none of the characters in the English capital alphabet are escapable (S7.8.4_A4.2_T1). Or, put differently, paragraph 7.8.4 states that only the lower-case x is escapable and usable for a HexEscapeSequence. Change-Id: Ie9f73726889ee9e0165c75c9b2e006a9f2b3dbda Reviewed-by: Lars Knoll <lars.knoll@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>
* Examples: quick/scenegraph - add needed main.qml file to pro fileCaroline Chao2012-11-282-2/+4
| | | | | | | | | To fix the installation for customgeometry and simplematerial examples. Task-number: QTBUG-28243 Change-Id: Iafe62e30e7a0deeaeb0b6755fa2fd25a31f18ce5 Reviewed-by: Holger Ihrig <holger.ihrig@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>