summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qdeclarativecomponent.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-291-24/+24
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Update contact information in license headers.Sergio Ahumada2012-08-011-2/+2
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. 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: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-111-1/+1
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Surviving out of memory in Qt Quick appmread2011-11-211-47/+55
| | | | | | | | | | | | | | | | | The QtQuickPlayground app contains a version of samegame which allow the user to edit the code. By setting the ball size to 8, the app can run out of memory. This leaves it in a pretty bad state. But apps on Symbian shouldn't crash due to OOM and should allow some operation. This change fixes the immediate OOM crashes in declarative, gui and corelib. It shows warning dialogs which explain what has gone wrong and leaves the app in a state that can be exited cleanly from the Symbian task list. Task-number: QT-5319 Reviewed-by: Shane Kearns Reviewed-by: Gareth Stockwell Reviewed-by: Martin Jones
* Rename QDeclarativeEngineDebugServer to ~ServiceKai Koehne2011-09-161-2/+2
| | | | | | | | | | And fix the file names/location, too Change-Id: If2d5ec0896332896ad11af748ec8f75c39e1555c Reviewed-on: http://codereview.qt.nokia.com/3890 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com> (cherrypicked from 8804ec49bda8672c5700ab843f2958c3d2bd8e41)
* Update licenseheader text in source files for qt4.8Jyri 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
| |