aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Enabling Qt QML linking to Qt Quick.v5.0.0Jerome Pasion2012-12-171-1/+1
| | | | | | | | Allows Qt QML pages to link to Qt Quick. Task-number: QTBUG-28579 Change-Id: I9eafadc5ee14a5588a5863960c4463132b73b287 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* remove obsolete DEPENDPATH assignmentsOswald Buddenhagen2012-12-162-2/+0
| | | | | | | | qmake now add CONFIG+=depend_includepath by default, making manual DEPENDPATH setup unnecessary. Change-Id: I6cefdd70ffd3a0ef889752eafec8b999822588cf Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove some unnecessary CONFIG additionsOswald Buddenhagen2012-12-1613-14/+10
| | | | | | | | 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-1519-22/+22
| | | | | | | | | 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>
* Add minimal plugin importing to quick2 qmlplugindump toolMiikka Heikkinen2012-12-141-0/+2
| | | | | | | Task-number: QTBUG-28131 Change-Id: Iad55e3c6057b060cd8f8233e02a6151c91cc32ed Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fixed samegame tutorial part 4 to reflect Quick2 stateOliver Wolff2012-12-143-20/+28
| | | | | | Change-Id: I61a3d63bc0268256ff6497339a6d97719a59860f Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Improved cosmetics for StockQtJens Bache-Wiig2012-12-138-45/+76
| | | | | | | | This will not get us any design awards but it looks a bit more professional than the original. Change-Id: Ib01a20ebad5888af44c174cbd493ce8d99dcf7b6 Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
* Clean up the StockQt demoJens Bache-Wiig2012-12-1310-789/+726
| | | | | | | | | I cleaned up the whitespace, property declarations and removed some console output. No changes to the functionality or design. Change-Id: I499f6d061e43bf2e187eebc026858b3abd21a9b0 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Alan Alpert <aalpert@rim.com>
* Fix StocQt buttonsAlan Alpert2012-12-124-155/+124
| | | | | | | | They're now on screen and using better componentization for the styling. Task-number: QTBUG-28291 Change-Id: If21712e523c706ee05d257e209ed71dd61acf2dc Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@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-122-2/+2
| | | | | | | This seems more in line with the rest of the qdocconf files Change-Id: I91999205b0632a2c0e57f428754cf5928a1ea6c7 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Add \brief comment to Custom Geometry examplehjk2012-12-121-1/+1
| | | | | Change-Id: I11be2329d2d396bc778a5eeda45dda9b30337285 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Use resource files for most examplesKai Koehne2012-12-1299-160/+770
| | | | | | | | | Make examples shadow-build-friendly by using resource files instead of trying to derive the qml path from applicationDirPath(). Change-Id: I669424554c772d9b261249b366247190f5fbd8b1 Reviewed-by: Oliver Wolff <oliver.wolff@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-124-8/+13
| | | | | Change-Id: I1e85fd3f35f4f3d80e3fb599ae95b771db5f949b Reviewed-by: hjk <qthjk@ovi.com>
* Fixed install targets for model examplesOliver Wolff2012-12-113-0/+9
| | | | | Change-Id: I4c23fe37ec7adc17180c2405e68273b5cd3ee219 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Examples: Remove unused import "../shared"Kai Koehne2012-12-112-2/+0
| | | | | Change-Id: I3c84eab1ff97380362828aa96b0d5189cbd62509 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* Removed leftover file from example cleanupOliver Wolff2012-12-111-18/+0
| | | | | Change-Id: I63b9ca28724d651d8e4cb74eed114665a75e8b18 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.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>
* Move the Q_DECLARE_METATYPE to where it should be.Stephen Kelly2012-12-112-1/+1
| | | | | Change-Id: Id17b30ed59fd9e68229bb80de5b9e4bc2aa0b75d Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* make use of qt_headersclean.prfOswald Buddenhagen2012-12-112-57/+2
| | | | | Change-Id: I50f2299573770bb546333f57a61b6eb6b7e80e4e Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add PLUGIN_CLASS_NAME to qtdeclarative pluginsMiikka Heikkinen2012-12-114-0/+4
| | | | | | | | Needed for automating static plugin loading. Task-number: QTBUG-28131 Change-Id: I558a0f83c69179d3838c64fee069cc0e9c1d67cb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Move examples aroundAlan Alpert2012-12-1198-79/+203
| | | | | | | | | | 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-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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 11:12:27 +0000