summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativecomponent.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Update licenseheader text in source filesJyri Tahtela2011-05-131-17/+17
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-121-0/+17
|\ | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: ListView has wrong keyPressEvent behaviour when vertical Ensure view is positioned correctly when orientation changes. Fix regression in wigglytext.qml
| * Fix regression in wigglytext.qmlMichael Brasser2011-04-121-0/+17
| | | | | | | | | | | | | | | | | | | | | | This change re-adds the code removed in 8e9c28eaa4d7a3372b9a9a21a984701b62f96456 (which caused this regression), while keeping the new code as well (to specially handle the case of registration in componentCompleted()). Change-Id: I707e3d2ead9ea25079f79cd5e5886d1dc1c69d1b Task-number: QTBUG-18362 Reviewed-by: Aaron Kennedy
* | Doc: Fixed markup.David Boddie2011-03-251-2/+2
| |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-221-8/+18
|\ \ | |/ | | | | | | | | | | | | Conflicts: doc/src/declarative/declarativeui.qdoc doc/src/declarative/dynamicobjects.qdoc doc/src/declarative/elements.qdoc doc/src/examples/qml-examples.qdoc
| * fix/improve docs for new QtQuick 1.1 attributesBea Lam2011-02-281-8/+18
| | | | | | | | | | | | | | | | | | Ensure attributes added in QtQuick 1.1 are marked with the '\since QtQuick 1.1' tag. Also add links to items listed in the QtQuick 1.1 section in whatsnew.qdoc. Task-number: QTBUG-17771 Change-Id: Ic8fb3c8d3c99a1469c1767779efaafd27ef460e1
* | Merge commit 'refs/merge-requests/1108' of git://gitorious.org/qt/qt into ↵David Boddie2011-02-231-13/+10
|\ \ | |/ | | | | | | | | | | merge-requests/1108 Conflicts: doc/src/declarative/basictypes.qdoc
| * Ensure animations start correctly when running is bound to a value.Michael Brasser2011-02-211-13/+10
| | | | | | | | | | | | | | | | | | | | | | Animations register to be started when the component is finalized, but in the case of a binding, the registration doesn't happen until we are already working with a copy of the finalization list. With this patch, we no longer work with a copy, but with the actual list. Change-Id: If460c250d2403590907e9ac854d277db68ba8b2a Task-number: QTBUG-14042 Reviewed-by: Aaron Kennedy
* | Doc: Fixed links and whitespace.David Boddie2011-02-171-1/+1
|/
* Allow functions to be passed in as values for grouped propertiesBea Lam2011-01-281-3/+14
| | | | | | | | | | | Using QDeclarativeProperty::write() works for grouped properties but stops functions values from being passed in, and using QScriptValue::setProperty() on the object being created allows functions to be passed in but doesn't work for grouped properties. This fix walks down the tree for grouped properties to find the property that should be set so that functions can be set for grouped property values. Reviewed-by: Aaron Kennedy
* Adding support for group properties in Component::CreateObject()Christopher Ham2011-01-281-1/+5
| | | | | | | | | The QScriptValue overload for Component::CreateObject() should be able to set group properties. This change also allows for property binding from Javascript to continue to function. Task-number: QTBUG-13087 Reviewed-by: Bea Lam
* Fix object check in createObjectChristopher Ham2011-01-271-2/+2
| | | | | | | | The 'if' check for the value map was inverted. Spelling in warning was fixed. Task-number: QTBUG-13087 Reviewed-by: Bea Lam
* Fix righ-to-left support in text components.Christopher Ham2011-01-271-13/+54
| | | | | | | | | In text, textEdit and textInput, the layout of the text should automatically align to the right if the it is deemed to be right-to-left text. Task-number: QTBUG-15880 Reviewed-by: Bea Lam
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-191-1/+5
|\
| * Clarify Component.createObject(null) behavior.Martin Jones2011-01-141-0/+4
| | | | | | | | | | | | | | | | Setting the parent of the returned item does not affect its object ownership so care must be taken to ensure it is not garbage collected. Task-number: QTBUG-16630 Reviewed-by: Aaron Kennedy
| * Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-071-11/+0
|\ \ | |/ | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
| * Improve QDeclarativeComponent test coverage.Michael Brasser2010-12-221-11/+0
| |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2010-12-131-12/+16
|\ \ | |/
| * Some doc clarification for components and javascript integrationBea Lam2010-12-061-12/+16
| |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2010-12-011-1/+4
|\ \ | |/
| * Improve consistency in handling of aliases, bindings and value typesAaron Kennedy2010-11-291-1/+4
| | | | | | | | Task-number: QTBUG-13719
* | Add additional trace range data.Michael Brasser2010-11-191-1/+3
|/
* Largely rewrite the Using QML in C++ Applications documentation. ItBea Lam2010-11-041-0/+37
| | | | | | | | | | | | | | now has an overview of different approaches to QML/C++ integration and demonstrates how to pass data between QML and C++ through properties/functions/signals. The part in the old docs that focused on QDeclarativeContext has been merged into the QDeclarativeContext class docs (although most of the info was largely covered in there already) and the part that covered Network Components has been moved to the QDeclarativeComponent class docs. The custom enum types example previously in extending-tutorial.qdoc has been moved to these new docs. Task-number: QTBUG-14923
* Optimization: Don't generate intermediate QDeclarativeComponent'sAaron Kennedy2010-10-141-27/+30
|
* Remove some unnecessary includes in cpp filesAaron Kennedy2010-10-081-1/+0
|
* Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Aaron Kennedy2010-09-291-1/+1
| | | | | Task-number: QTBUG-13799 Reviewed-by: Martin Jones
* Merge branch '4.7' into qmldocsDavid Boddie2010-09-061-3/+5
|\
| * Complete Component::createObject() creation after setting the parent.Martin Jones2010-09-031-3/+5
| | | | | | | | | | Task-number: QTBUG-13170 Reviewed-by: Alan Alpert
* | Doc: Added types to method and signal documentation; other fixes.David Boddie2010-09-011-1/+1
|/
* Simplify type management codeAaron Kennedy2010-08-271-34/+21
|
* QDeclarativeDebug: send a message when new object are addedOlivier Goffart2010-08-241-2/+6
| | | | Reviewed-by: Lasse Holmstedt
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-161-0/+1
|\ | | | | | | | | Conflicts: doc/src/declarative/elements.qdoc
| * qdoc: Reorganized the QML elements table to be a dictionary...Martin Smith2010-08-161-0/+1
| | | | | | | | ...and a set of functional group pages.
* | Merge branch '4.7' of ../oslo-staging-2 into 4.7David Boddie2010-08-131-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/declarativeui.qdoc doc/src/examples/simpletreemodel.qdoc doc/src/examples/spinboxdelegate.qdoc doc/src/getting-started/demos.qdoc doc/src/getting-started/gettingstartedqml.qdoc doc/src/index.qdoc src/declarative/qml/qdeclarativeimageprovider.cpp
| * Doc: Fixes to Qt Quick documentation.David Boddie2010-08-091-1/+1
| | | | | | | | | | Reviewed-by: Trust Me To-be-verified-by: Qt Doc Team
* | Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938.Jerome Pasion2010-08-091-2/+2
|/ | | | | Reviewer: David Boddie Task number: QTBUG-11938
* Component docsBea Lam2010-07-291-21/+9
| | | | Task-number: QTBUG-12447
* Fixes for Dynamic Object Management docs. Also adds links toBea Lam2010-07-291-0/+3
| | | | | | this page from other documentation. Task-number: QTBUG-12446
* various doc fixesBea Lam2010-07-271-1/+3
|
* doc improvementsBea Lam2010-07-091-5/+23
|
* docsBea Lam2010-07-071-2/+2
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-07-061-3/+4
|\ | | | | | | | | Conflicts: doc/src/declarative/extending.qdoc
| * docWarwick Allison2010-07-061-2/+2
| |
| * Work around QTBUG-11929Warwick Allison2010-07-051-1/+2
| |
* | doc improvementsBea Lam2010-07-061-0/+30
|/
* Allow components to be created from .pragma library JS filesAaron Kennedy2010-06-251-1/+3
| | | | QTBUG-11507
* Move knowledge of QGraphicsObject out of qml engineAaron Kennedy2010-06-161-10/+15
|
* Doc improvements: move some example code to snippets, add screenshots,Bea Lam2010-06-091-5/+7
| | | | other minor doc fixes
* Move some example code into snippets/ and add other doc fixesBea Lam2010-06-091-1/+1
|