aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml
Commit message (Collapse)AuthorAgeFilesLines
* Accept missing semicolon after do-while statement.Erik Verbruggen2012-11-266-865/+945
| | | | | | | | | Although not valid according to ECMA 5.1, both JSC and V8 accept a missing semicolon after a do-while loop. (Both JSC and V8 do not do this through automatic semicolon insertion, but handle it as a special case.) Change-Id: Iff2b07b894564740d2dcbf9b1d46bc279d30b9e3 Reviewed-by: Alan Alpert <aalpert@rim.com>
* Enable module build with QT_NO_IMTasuku Suzuki2012-11-264-0/+10
| | | | | | Change-Id: I90f8ec7e6357db7b4038bb1646fe9d3835821556 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Alan Alpert (RIM) <aalpert@rim.com>
* Enable mobule build with QT_NO_TRANSLATIONTasuku Suzuki2012-11-267-4/+22
| | | | | | Change-Id: Id7aeef0d499f48ddc64b4ea3e4dc713db8458c38 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Alan Alpert (RIM) <aalpert@rim.com>
* Reduce number of relocationsMarc Mutz2012-11-231-11/+11
| | | | | | | ...by turning pointer into array variables. Change-Id: Ia5a0cedcf28d54210cc1f179db5c519e7e0672cc Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Stop using the name "trolltech" in interface nameTasuku Suzuki2012-11-231-1/+3
| | | | | | Change-Id: Ie30146415c99700c1b55fb2f01331ec9b1a42359 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* docs: Separate qml and c++ examplesFrederik Gladhorn2012-11-231-1/+13
| | | | | Change-Id: I1d9e2e281bff2bb77a8bdf53726d3c452e3fe911 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Doc: Adding "qtgui" to the documentation dependency.Jerome Pasion2012-11-221-1/+1
| | | | | | | | -Qt Quick and Qt QML depend on Qt GUI and its documentation. Change-Id: Icf14107490bf7a884a5e5840d7ec7bdd62e1cf09 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Add designer support for animations and componentCompleteMarco Bubke2012-11-224-17/+43
| | | | | | | | | In the designer animations confuse users, if you change a state or move a item around. Also component complete is called later by the designer. The call in the VME is to early. Change-Id: I49aa04edbc49fb44ddb7b52062307982865efd7e Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Deliver parameters to bound signals.Frederik Gladhorn2012-11-211-0/+1
| | | | | | | | | | | | | | In the following property change "mouse" would be undefined since the number of parameters was not correctly evaluated. PropertyChanges { target: mouseArea onClicked: console.log(mouse) } Task-number: QTBUG-27300 Change-Id: Ie3fb9a49155312af1feb5c7ff67d78e019925130 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Document importing issues in worker scriptJędrzej Nowacki2012-11-212-0/+3
| | | | | | Task-number: QTBUG-27454 Change-Id: Ia9f384ab92fe0c55d3299d32a3f7faba1446ce35 Reviewed-by: Alan Alpert (RIM) <aalpert@rim.com>
* Merge branch 'newdocs'Eskil Abrahamsen Blomfeldt2012-11-201-1/+0
|\ | | | | | | Change-Id: Idd7a9837e4f6a1358edf9accdcdc3c71822f4c25
| * Merge branch 'master' of ssh://codereview.qt-project.org/qt/qtdeclarative ↵Jerome Pasion2012-11-0220-43/+126
| |\ | | | | | | | | | | | | | | | into newdocs Change-Id: Icced038fbdb309d8928213d3753a27fe5a6b1137
| * | Doc: Removed the HTML template from the .qdocconf filesJerome Pasion2012-10-291-1/+0
| | | | | | | | | | | | | | | | | | | | | -qt-module-defaults.qdocconf already contains the HTML template. Change-Id: I8ecac8e959d0fe8705295f4c9a58dd6b98ca1a44 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | | Fixed memory leak of registered QML modulesVadim Zakondyrin2012-11-191-0/+4
| | | | | | | | | | | | | | | | | | Change-Id: I254f755641f5ac8383e5818b5294ec85fd9236e8 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* | | Use the new QLibraryInfo::Qml2ImportsPath path for QML 2.Thiago Macieira2012-11-194-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also change the environment variable to be QML2_IMPORT_PATH. This splits the imports from QML 1 (the QtDeclarative library). Change-Id: Icadbf96283b1cf071ed0deb04e8c8476da664009 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Christopher Adams <chris.adams@jollamobile.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | Improve documentation.Frederik Gladhorn2012-11-101-3/+4
| | | | | | | | | | | | | | | Change-Id: I9bfb8bf8167e3b55d3539dc35e4278b5514119c8 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | | Fix compilation issue with clang in C++11 mode.Erik Verbruggen2012-11-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As with all other qHash functions, providing a default value for the seed is needed. Compiler error: In file included from qml/v8/qv8engine.cpp:42: In file included from qml/v8/qv8engine_p.h:57: In file included from /Users/erik/dev/qt5-stable/qtbase/include/QtCore/qvariant.h:1: In file included from /Users/erik/dev/qt5-stable/qtbase/include/QtCore/../../src/corelib/kernel/qvariant.h:50: In file included from /Users/erik/dev/qt5-stable/qtbase/include/QtCore/qhash.h:1: /Users/erik/dev/qt5-stable/qtbase/include/QtCore/../../src/corelib/tools/qhash.h:107:35: error: no matching function for call to 'qHash' Q_DECL_NOEXCEPT_EXPR(noexcept(qHash(t))) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~ [skipping macro expansion and candidate qHash functions] qml/v8/qv8engine_p.h:89:13: note: candidate function not viable: requires 2 arguments, but 1 was provided inline uint qHash(const v8::Handle<v8::Object> &object, uint seed) Change-Id: I917785ce5ce596757fe06ced1536797090bb0f77 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | | QQmlPropertyCache: adding setParent()Thomas Hartmann2012-11-052-0/+6
| |/ |/| | | | | | | | | | | | | | | | | | | setParent() enables to dynamically set the parent of a QQmlPropertyCache. This is used in the Qt Quick Designer to create dynamic properties on an arbitrary object. Change-Id: I0dafabcacf4222fc1bfe693736cbd23e1e928e8f Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com> Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* | Changed the plugin module nameVenugopal Shivashankar2012-10-293-14/+14
| | | | | | | | | | | | | | | | | | | | The earlier name, com.nokia.TimeExample is irrelevant now. Also updated all instances of documentation where this older module name was referred. Change-Id: Ic252d0e72af23c2d39d5fed55f242e47c1b6bde9 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | Remove stale QT_MODULE() usage casesSergio Ahumada2012-10-296-12/+0
| | | | | | | | | | | | | | | | As of Qt5, this macro is defined to be empty; simply get rid of these leftovers. Change-Id: Ib3a8e8eae98e2839c3db4bf34be8dcf43f49af11 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* | Change qml list interfaceMarco Bubke2012-10-234-11/+54
| | | | | | | | | | Change-Id: I185c6f4cef6105544504324c1616b5995c219fe3 Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
* | Adding invalidate function to QQmlPropertyCacheThomas Hartmann2012-10-232-0/+34
| | | | | | | | | | | | | | | | This is required for tooling to update a QMetaObject inside a running QQmlEngine. Change-Id: I26d3aeed57d39c361c150261c4e1a84094e6f657 Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
* | QQmlOpenMetaObjectType: extend interface for visual designerThomas Hartmann2012-10-192-0/+21
| | | | | | | | | | | | | | | | We need those 3 functions to rebuild OpenMetaObject in the visual designer. Change-Id: I70affe5850f46683a049615b3173a4f30c338401 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | Doc: Cleaned up \module and \qmlmodule page for Qt Quick and Qt QML.Jerome Pasion2012-10-172-5/+2
| | | | | | | | | | | | | | | | -Qt Quick: used a regular page instead of \qmlmodule -Cleaned up titles and membership Change-Id: I8ae24fec203ea675d213bd0df6105d0c2abd8164 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | We need to export QQmlVMEMetaObject to support the designerThomas Hartmann2012-10-121-1/+1
|/ | | | | | | | In the designer we need to access QQmlVMEMetaObject. Change-Id: I36627c6ce1c2c27bef8dd85374b65a542b00d1ef Reviewed-by: Aurindam Jana <aurindam.jana@digia.com> Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
* Update docs after modularization of docsTor Arne Vestbø2012-10-122-5/+4
| | | | | | | | | The global files now live in qtbase only, and are made available to the other modules via the $QT_INSTALL_DOCS variable. Change-Id: I131408e27fec5b722ac1dece8e1ccf421fdaad67 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* Remove calculateHash functionPeter Varga2012-10-101-79/+3
| | | | | | | This function has been moved into QtV8 module. Change-Id: Ibc5b0a52bd158e8880a10300eb6b89b7f43db0f6 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix QObject::receivers() within connectNotify()Thomas McGuire2012-10-101-2/+6
| | | | | | | | | The receiver count needs to be correct in connectNotify() to be compatible with ordinary connections. Fix this and add test. Change-Id: Icff0486dac49876b8c5d8836a85cff9284368a52 Reviewed-by: Alan Alpert <416365416c@gmail.com>
* Complete QmlJSVisitor for UiParameterListThomas Hartmann2012-10-084-1/+11
| | | | | | | | QmlJS::Visitor was missing the visit for UiParameterList. Change-Id: I3c2cb76b934059ebcef53c1a0faad3f239b33359 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Christian Kamm <kamm@incasoftware.de>
* Fix in QmlJS parser for UiParameterListThomas Hartmann2012-10-012-0/+3
| | | | | | | | | | | | The propertyTypeToken was not initilized in this case. Not having the source location of this token leads to bugs in the tooling. e. g.: QTCREATORBUG-7931 I also added the initializer for program keeping the parser and the grammar in sync. Change-Id: Id7bfb4b6dd1b9689e701a858b6c769d3addab5dc Reviewed-by: Christian Kamm <kamm@incasoftware.de>
* Fix a crash in QQmlPropertyCache::findPropertyJocelyn Turcotte2012-09-282-25/+29
| | | | | | | | | | | | | | | | | | | | | When the top type of a QML component is a C++ type registered with qmlRegisterExtendedType, its QObjectPrivate::metaObject is already a QQmlProxyMetaObject that gets chained as the parent of the QQmlVMEMetaObject of the component. When QQmlPropertyCache::findProperty iterates over the parents chain of a child item, our QQmlProxyMetaObject eventually gets static_casted to QQmlVMEMetaObject and causes a crash. This patch implements a poor man's dynamic_cast in QQmlVMEMetaObject::parentVMEMetaObject to fix the crash. Other casts of parent.asT1() are changed to use parentVMEMetaObject as well even though in those cases the static_cast is guaranteed by the context. Task-number: QTBUG-27334 Change-Id: I5982fc273ccf466960ce54974cff5662e6ab605a Reviewed-by: Matthew Vogt <mattvogt2@gmail.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Update qMetaType helpers usage.Jędrzej Nowacki2012-09-271-8/+8
| | | | | | | | QtDeclarative is using private meta type api to register custom types, but the helper functions were updated to a new signature. Change-Id: I467b283b5b1ccdad8ebd1a2bb651e8ad59b9c55d Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* doc: Fix some typos in C++ integration documentationEskil Abrahamsen Blomfeldt2012-09-263-3/+3
| | | | | Change-Id: I883109cf2528a5e10487b38f453c2eed96cc3204 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Fixed missing virtual destructors in qtdeclarative.Samuel Rødal2012-09-247-4/+20
| | | | | | Change-Id: I0b0e63b572617a56874e27361479de2690644aa3 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Windows CE buildfixAndreas Holzammer2012-09-242-1/+5
| | | | | | | | | Windows CE has a define for CONST, so undef it. Change-Id: I13d363657e91956c611dee4cf90cd17f6a0fa234 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add missing QT_{BEGIN,END}_{NAMESPACE,HEADER}Sergio Ahumada2012-09-231-0/+6
| | | | | Change-Id: I5f61a443b49d40c66669fa0c679df7eaab761e73 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-23406-7709/+7709
| | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Ie7f5d49ed8235d7a7845ab68f99ad1c220e64d5c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Qt QML: Updated qtqml.qdocconfJerome Pasion2012-09-211-5/+4
| | | | | | | modified path to doc/global Change-Id: I646b69c38381556f786e0b4346118d035cbd3648 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Add a Q_UNREACHABLE to improve code generation a littleThiago Macieira2012-09-132-0/+2
| | | | | | | | The code can't reach there anyway, so let's help the compiler out a little. Change-Id: Icee6ebe426c1116a7baaf2c5766c6d8f8276f3ac Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Make the instruction table be constThiago Macieira2012-09-133-7/+7
| | | | | | | It's never going to be modified, so it should be const. Change-Id: Ibc3bac0583f72ccbf7caa69aeab029bae03d3cdd Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* centralize load(qt_build_config)s in .qmake.confOswald Buddenhagen2012-09-111-2/+0
| | | | | Change-Id: Ide2e054e9b5b58976410d16ca4f76fd55e61676d Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* doc: fix some more typosSergio Ahumada2012-09-103-3/+3
| | | | | Change-Id: I7fa055049b9e5900d597754c6004febb153de12b Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* doc: fix some typos in .cpp filesSergio Ahumada2012-09-075-6/+6
| | | | | Change-Id: Ica7685aefde84ec80d8af7a67541af454de4adce Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* Doc: Use settings from global qdocconf.Casper van Donderen2012-09-051-52/+4
| | | | | | | Depends on the integration of #34077 Change-Id: I188d7617c4805d00226d0fb8d5768a02d24c6933 Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
* Delete weak JS objects on exit right awayThomas McGuire2012-08-311-1/+4
| | | | | | | | | This reduces memory leaks on exit when the engine is destroyed after exec() has finished. Change-Id: I917d103966d55b4dd3ba4e986ff902e29d8fb0ac Reviewed-by: Chris Adams <christopher.adams@nokia.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Evaluate bindings more intelligently during constructionAaron Kennedy2012-08-2917-123/+318
| | | | | | | | | | | | | | | | | Instead of just evaluating bindings in a fixed order, and possibly having to evaluate a single binding multiple times, prior to reading a property, we check if there are any bindings "pending" on it and evaluate them then. A pending binding is one that has been assigned to the property, but not yet evaluated. To minimize side effects we only do this for "safe" bindings. A safe binding is one that has no side effects, which we currently define as not calling functions or otherwise assigning values during its evaluation. This isn't an entirely foolproof way to ensure that the evaluation has no side effects, but it should be good enough. Change-Id: I98aa76a95719e5d182e8941738d64f8d409f404a Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Fix compiler warnings from MSVC2010Kai Koehne2012-08-281-0/+5
| | | | | Change-Id: I44eb0113374c221a166609c4fd29b5dad05ecc94 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Console API: Print JS objectAurindam Jana2012-08-281-12/+23
| | | | | | | | | Calling console.log(), console.debug(), print() etc would only print out "Object" if a JS Object was passed as an argument. This patch calls the toString() on the object. Change-Id: Iadf8b4d1fe81c3e2c7bd65e3c153a930fd994bef Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Fix property overriding lookup to exclude functionsv5.0.0-beta1Matthew Vogt2012-08-281-8/+28
| | | | | | | | Function overriding is required by QmlTest, and is likely to be used by other existing QML users. Change-Id: I04086a933456145bda5cede74aba753799feb555 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Reduce memory usage of QV4Bindings::Subscription by 8 bytes.Thomas McGuire2012-08-282-18/+50
| | | | | | | | | | There is no need to store the method, as it can be calculated via pointer arithmetic. That leaves the active flag, which now is the last bit of the bindings pointer. Change-Id: I17b443e63be2d950aa80ad15cc76372b415c3dd6 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>