aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/ftw
Commit message (Collapse)AuthorAgeFilesLines
* Rename QDeclarative symbols to QQuick and QQmlMatthew Vogt2012-02-2425-6840/+0
| | | | | | | | | | | | | Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Update ftw classesAaron Kennedy2012-02-205-9/+695
| | | | | | | This is for the benefit of subsequent changes. Change-Id: Ib494efb1474d069c067194008c9832653d5d8eb4 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Reduce the memory used by QStringHashAaron Kennedy2012-02-162-231/+517
| | | | | | | | | This change reduces the memory consumed by individual QStringHashNodes, and adds support for "linking" one hash to another that allows us to avoid copying all the nodes. Change-Id: Ib5bd151d8ec610a020fd125f46a4e218d959529b Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-3022-22/+22
| | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: If39bd256b0fa85eba17ea30f8ab87ea27d758908 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Use QMetaType::QVariant as the type for QVariantKent Hansen2012-01-251-7/+2
| | | | | | | | | | | Change http://codereview.qt-project.org/#change,12408 in qtbase updates moc and friends to use QMetaType::QVariant instead of the magic -1 / 0xffffffff / QVariant::LastType. This change adapts qtdeclarative accordingly. Change-Id: Ifb120485a4ee1501df6ad42d8ecd590824c85e9f Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com> Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Allow JS API in modulesMatthew Vogt2012-01-241-0/+13
| | | | | | | | | Allow modules to export verisoned javascript code into specified namespaces. Task-number: QTBUG-20857 Change-Id: Ic968c697ba36cbc4535870ed5eed2fe7f01af11d Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-2322-22/+22
| | | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I6a730abc0c396fb545a48b2d6938abedac2e3f1c Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Remove the use of QT_MODULE()Gunnar Sletta2012-01-201-1/+0
| | | | | Change-Id: I1c07231b0bf412fe490a44b9a060bb2e2ef11154 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-0522-22/+22
| | | | | Change-Id: I0a8d99909cac867dce72da70b1bbcb649989a51b Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Link against librt to make use of clock_gettimeKai Koehne2011-12-141-0/+1
| | | | | | | Allow using qdeclarativetrace_p.h on Linux Change-Id: Ib5d9dad156897ea40825136ac2e818c1250ad403 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Add a tracing API for the QML engineAaron Kennedy2011-12-144-0/+461
| | | | | Change-Id: Ic03583444d586f275897d765be8e1b5e69fdd5d4 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Fix default property preventing signals from being emitted.Glenn Watson2011-11-222-0/+183
| | | | | | | | | | | | Change the way connectAlias works so that even if the target for the connection is not available immediately, anything that is bound to it is notified when the target is changed. (Fix is authored by Aaron). Task-number: QTBUG-21580 Change-Id: Ida23c0e620069c50b123c71b5078929d4c7ec4e4 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix MSVC warning about struct vs class declarationKai Koehne2011-11-211-1/+1
| | | | | | | Change-Id: I00dc08c746b30f6d49b831989ae1d0d798b430a5 warning: C4099: 'QMetaObject' : type name first seen using 'struct' now seen using 'class' warning: C4099: 'QV4Program' : type name first seen using 'class' now seen using 'struct'` Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Add missing includes.Jędrzej Nowacki2011-11-112-0/+2
| | | | | | | | We want to move forward declarations in qtbase. It is not good to depend on qmetatype.h to do all forwarding. Change-Id: I7d5ecec239e6c2ce5576b19f7af1c6d8d8222e7e Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Make compile and pass CI tests.Michael Brasser2011-11-112-0/+3
| | | | | Change-Id: Ie2ec20d9e346ccaf698762d6abf0224c39fb3490 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Don't crash if contexts are deleted during refreshExpressionsAaron Kennedy2011-11-042-0/+114
| | | | | Change-Id: I23b59d33c07b017ef7355a7fe4a728d84c5d7eaa Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Skip the captured properties step in bindingsAaron Kennedy2011-11-043-0/+222
| | | | | | | | | | Objects and notifiers in the capturedProperties list were not guarded which can lead to crashes if they're deleted prior to the binding completing. Now the notifiers are connected to and guarded immediately to prevent this. Change-Id: I912e323c52bf6169fb5077e552d5d38d9aa7faec Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Clean up declarative includesKent Hansen2011-10-171-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (This commit is in preparation of moving several files to a separate library (QtQuick2).) Don't add all subfolders to the includepath (from the .pri files). There's no good reason to do that. For headers (both public and private) that are in the same folder as the file that includes them, prefer to use #include "foo.h" #include "bar_p.h" For public headers that are outside the current folder but have "unambiguous" names (e.g. qdeclarative prefix), use #include <foo.h> For private headers that are outside the current folder, use #include <private/baz_p.h> Also change #include <QtDeclarative/private/foo_p.h> to #include <private/foo_p.h> The header filenames already have a qdeclarative or qsg prefix; there's no need to prefix by module name to disambiguate. Finally, #include "private/foo_p.h" should be avoided. private/ is used for auto-generated (forwarding) headers, which never reside in the current (source) directory. Use angle brackets instead. Change-Id: I04f8477fdba043546064ee276475c09dc373f8f2 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Remove QMetaObjectBuilder from declarative.Friedemann Kleint2011-10-143-2932/+0
| | | | | | | | Link on Windows. Change-Id: Idca11c1a21ad5aebf79d6487692d912b4dea249f Reviewed-on: http://codereview.qt-project.org/6553 Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
* Use QBasicAtomicInt load() and store() instead of implicit castingBradley T. Hughes2011-10-101-3/+3
| | | | | | | | | | | | | The implicit casts will be unavailable in the near future. This is a follow up to commit 7f8472af8c03296be9e9ce50d8e9b3089eedf2f1, which didn't catch all usages of the implicit cast and assignment operator. Change-Id: If05c343e2851b41e4a351c56328c4406c688fa0d Reviewed-on: http://codereview.qt-project.org/6351 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Allow incubators to be driven recursivelyAaron Kennedy2011-10-062-0/+106
| | | | | | Change-Id: If8ce239372c3cf3166b666329ba812b25ee54669 Reviewed-on: http://codereview.qt-project.org/6102 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Asynchronous component instantiationAaron Kennedy2011-09-297-77/+947
| | | | | | | | | | | | | This introduces two main: * the QML compiler executes in a separate thread * item instantiation can be interrupted and resumed to allow it to be split across multiple frames. Task-number: QTBUG-21151 Change-Id: I9631c62bb77da3a2e0c37f0da3719533fdce4fef Reviewed-on: http://codereview.qt-project.org/5676 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Get rid of QDeclarativeUtilsKent Hansen2011-09-192-92/+0
| | | | | | | | | | | All the QChar methods needed by QtDeclarative have now been optimized to achieve at least as good performance as the QDeclarativeUtils versions. Change-Id: I5b8dd58f9b597f716b53563d07d39d894c5dd666 Reviewed-on: http://codereview.qt-project.org/5059 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Merge branch 'master' into refactorGunnar Sletta2011-09-125-71/+75
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/cppextensions/qwidgets/qwidgets.pro examples/declarative/minehunt/main.cpp examples/declarative/minehunt/minehunt.pro src/declarative/items/context2d/qsgcontext2d.cpp src/declarative/items/qsgflickable.cpp src/declarative/items/qsgtextedit.cpp src/declarative/items/qsgtextinput.cpp src/declarative/particles/qsgangleddirection.cpp src/declarative/particles/qsgcumulativedirection.cpp src/declarative/particles/qsgcumulativedirection_p.h src/declarative/particles/qsgfollowemitter.cpp src/declarative/particles/qsgmodelparticle.cpp src/declarative/particles/qsgparticlesystem.cpp src/qtquick1/util/qdeclarativeview.h tests/auto/declarative/examples/examples.pro tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp Change-Id: Ib4be2a5e742dee1a399d73da97161736f77448e5
| * Fix missing and outdated license headers.Jason McDonald2011-09-094-68/+68
| | | | | | | | | | | | Change-Id: I940ced2e84a86daabc5158d348b05b7532cb1c22 Reviewed-on: http://codereview.qt-project.org/4314 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
| * Allow reference to signals using 'on' handler syntax.Michael Brasser2011-09-011-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | This will allow APIs like the following: trigger: mouseArea.onClicked However, signal handlers will not be callable from QML: mouseArea.onClicked() //throws exception Change-Id: I2ef5cb4e1f3ed4814ef590962391e1b14e3f0c43 Reviewed-on: http://codereview.qt.nokia.com/3683 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* | Fix export symbols for QtDeclarative and QtQuick1.Friedemann Kleint2011-08-313-4/+5
|/ | | | | | | | | | | Fix build on Windows and compiler warnings. Requires 090ee21eac7257644422e35395194e5fd7fb8efa in qtbase. Change-Id: Ief8da504ccd3e2c2e78644cc9943d685c4302019 Reviewed-on: http://codereview.qt.nokia.com/3988 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix wrong assertion in StringRef::load.Roberto Raggi2011-08-301-1/+1
| | | | | | | Change-Id: Ib39804b87027bda8cc6694b26e98e18bbc3a159f Reviewed-on: http://codereview.qt.nokia.com/3798 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Fix comparison.Roberto Raggi2011-08-301-1/+1
| | | | | | | Change-Id: I58ae5237f3458ee4bada89d1d676645e575d681f Reviewed-on: http://codereview.qt.nokia.com/3777 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Reduce allocationsAaron Kennedy2011-08-301-0/+40
| | | | | | Change-Id: I230424147ad195239d725359fcd6dc5568f102a7 Reviewed-on: http://codereview.qt.nokia.com/3772 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Optimize default property resolution in compilerAaron Kennedy2011-08-303-0/+70
| | | | | | Change-Id: I90b677a190c0c59ba681a7643a9b13cfb938d5a1 Reviewed-on: http://codereview.qt.nokia.com/3769 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Introduce QHashField for use in "contains" tests.Aaron Kennedy2011-08-302-0/+121
| | | | | | Change-Id: I35aadace15b71b44c1b9e30a76eadf79fe03afad Reviewed-on: http://codereview.qt.nokia.com/3767 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Calculate the hash inside QHashedStringAaron Kennedy2011-08-301-3/+89
| | | | | | | | | This avoids calling into V8 to calculate the hash. This improves performance and removes the dependency on V8. Change-Id: I8ccb405cba15c7eda51a1d56652784164789de7f Reviewed-on: http://codereview.qt.nokia.com/3765 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Use strings more conservativelyAaron Kennedy2011-08-304-20/+330
| | | | | | | | | Also adds the ability to efficiently estimate the length of, and write out to, UTF8 from QHashedStringRef. Change-Id: I8b6226ba41d855246ddf7d6268f8045c92ae219e Reviewed-on: http://codereview.qt.nokia.com/3764 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Add QFastMetaBuilderAaron Kennedy2011-08-303-1/+569
| | | | | | | | | | | This is a faster, but less convenient, version of QMetaObjectBuilder. The aim is to reduce allocations made during building the meta object by doing it in two passes - first you reserve all the strings needed and then you provide their data. Change-Id: Id9caf9c9c6c2ab6a5219e5cea9363463a4ebf822 Reviewed-on: http://codereview.qt.nokia.com/3763 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Some lexer improvement, mostly by avoiding QChar::isWhatever()Martin Jones2011-08-302-1/+92
| | | | | | | Change-Id: I330a45a2f611a594d9b0e9bb24ebef028654a8d8 Reviewed-on: http://codereview.qt.nokia.com/3756 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Clearing a hash makes its length 0.Martin Jones2011-08-301-0/+1
| | | | | | | Change-Id: Ie5b1251212b504d7a7621abdd7fe4e9305790846 Reviewed-on: http://codereview.qt.nokia.com/3752 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Remove invalid assertMartin Jones2011-08-301-1/+0
| | | | | | | Change-Id: Ia0544cf8c1d236977f193ad4c5726217035cabcb Reviewed-on: http://codereview.qt.nokia.com/3749 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* QStringHash improvementsAaron Kennedy2011-08-302-165/+295
| | | | | | Change-Id: I1844460095f4de4980d458dc696c0aab8b504c23 Reviewed-on: http://codereview.qt.nokia.com/3746 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Improve QStringHashAaron Kennedy2011-08-302-52/+334
| | | | | | | | We now support reserving nodes, and keys that are ASCII strings. Change-Id: I9cc04438a1e9ceee1081cb1216e0273227551222 Reviewed-on: http://codereview.qt.nokia.com/3745 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Use memory more conservatively during QML compilationAaron Kennedy2011-08-304-0/+505
| | | | | | Change-Id: I63af79e575345bce00d724f1e7c87606156d1479 Reviewed-on: http://codereview.qt.nokia.com/3744 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Move tools classes into their own directoryAaron Kennedy2011-08-3011-0/+4717
Change-Id: Ic8a3a35f36259659cb83b5e11641af47bd8b18a9 Reviewed-on: http://codereview.qt.nokia.com/3743 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>