summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Collapse)AuthorAgeFilesLines
* Add export to QDeclarativeBasePositionerMarco Bubke2010-09-271-1/+1
| | | | Bauhaus needs this export to manage layouts.
* Fix assert when placing a .qml file inside $QTDIR/importsKai Koehne2010-09-271-0/+1
| | | | | | | | | | The assert "Internal error: Plugin imported previously with different uri" happens on Windows. $QTDIR\imports, which is prefixed to the search path, is still written with backslashes. Unify this to forward slashes for all paths. Task-number:QTBUG-13994 Reviewed-by: mae
* Document PropertyAnimation::targets propertyBea Lam2010-09-271-1/+8
|
* Fix test.Michael Brasser2010-09-271-0/+4
|
* More declarative autotests.Michael Brasser2010-09-241-1/+1
|
* Various declarative autotest additions.Michael Brasser2010-09-231-1/+1
|
* Fix ListModel::set() so the implementation and docs areBea Lam2010-09-231-2/+3
| | | | | consistent. If index == count() the item should be appended. Also, this should happen regardless of whether the list is empty.
* Improve docs for Qt.quit()Bea Lam2010-09-231-1/+3
|
* Remove unused, unexported class.Michael Brasser2010-09-234-127/+0
|
* Remove dead code paths in declarative list model code.Michael Brasser2010-09-234-44/+0
| | | | Reviewed-by: Bea Lam
* Move includes after copyright blockMartin Jones2010-09-221-5/+2
|
* Mitigate private header problems in QtCreator by adding semi-private APIKai Koehne2010-09-222-0/+98
| | | | | | | | | | Add a semi-private API to get QScriptEngine for a QDeclarativeEngine. So far the qmljsdebugger lib in QtCreator accessed the script engine via QDeclarativeEnginePrivate. Replace this by a minimal API that is still in a private header, where we nevertheless can make some BC checks/guarantees. Aaron Kennedy agreed with the idea. Task-number: QTCREATORBUG-2179
* Mitigate private header problems in QtCreator by adding semi-private APIKai Koehne2010-09-224-3/+42
| | | | | | | | | | Add a semi-private API to get QScriptEngine for a QDeclarativeEngine. So far the qmljsdebugger lib in QtCreator accessed the script engine via QDeclarativeEnginePrivate. Replace this by a minimal API that is still in a private header, where we nevertheless can make some BC checks/guarantees. Aaron Kennedy agreed with the idea. Task-number: QTCREATORBUG-2179
* Add exports for BauhausThomas Hartmann2010-09-212-2/+2
| | | | | | The QmlDesigner(Bauhaus) should not rely on -nokia-developer Reviewed-by: Marco Bubke
* Fix a crash in QDeclarativeVisualDataModelJoona Petrell2010-09-211-3/+3
| | | | | Task-number: QTBUG-13754 Reviewed-by: Martin Jones
* Small optimization for QDeclarativeVisualDataModel.Michael Brasser2010-09-211-2/+2
| | | | Reviewed-by: Martin Jones
* Make build on SymbianBea Lam2010-09-202-29/+33
|
* Make qml debugging work with command line argumentsLasse Holmstedt2010-09-171-11/+30
| | | | | | | | | | The environment variables do not work for Symbian devices, so without this change, QML debugging cannot be done on them. In addition, configure now contains an option to disable qml debugging entirely, due to it being a major security risk. Reviewed-by: kkoehne
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-179-183/+598
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix example after changes to font.letterSpacing. Autotest and small fix for QDeclarativeFontLoader. Improve error messages Changes to objects returned from get() should emit itemsChanged() so Make it clear that private ListModel constructor is only for worker Remove duplicated move() implementations Doc changes Fix QDeclarativeXmlQuery mutex locking and don't wait for new jobs if the query has already quit PathView didn't accept mouse events, preventing it from working in a Flickable. Moving items in a PathView caused PathView.onPath to be set to false. Fix worker agent to emit ListModel itemsChanged() correctly when set()
| * Autotest and small fix for QDeclarativeFontLoader.Yann Bodson2010-09-171-5/+1
| |
| * Improve error messagesBea Lam2010-09-171-3/+3
| |
| * Changes to objects returned from get() should emit itemsChanged() soBea Lam2010-09-175-38/+411
| | | | | | | | | | | | | | | | | | | | | | that the view is updated (currently the model data changes but the view does not). In flat-model mode, get() now returns a QScriptClass-type object so that changes to the returned object are received, and for nested-model mode, the fix adds a QDeclarativeOpenMetaObject subclass and ModelNode::listIndex so that itemsChanged() can be emitted when the node data changes. Task-number: QTBUG-12363
| * Make it clear that private ListModel constructor is only for workerBea Lam2010-09-174-20/+33
| | | | | | | | | | agent. Also set up the worker list copy in the ListModel implementation instead of the agent.
| * Remove duplicated move() implementationsBea Lam2010-09-171-34/+26
| |
| * Doc changesBea Lam2010-09-171-4/+4
| |
| * Fix QDeclarativeXmlQuery mutex locking and don't wait for new jobs if the ↵Joona Petrell2010-09-171-3/+5
| | | | | | | | | | | | | | query has already quit Task-number: QTBUG-13041 Reviewed-by: Aaron Kennedy
| * PathView didn't accept mouse events, preventing it from working in a Flickable.Martin Jones2010-09-172-75/+112
| | | | | | | | | | | | | | | | | | | | | | Since it didn't accept the press it didn't get a grab, so its events were always filtered away by Flickable. Use the same implementation as Flickable, i.e. create private handler functions for mouse events and accept normal events in the mouse*Event() methods. Task-number: QTBUG-13687 Reviewed-by: Michael Brasser
| * Moving items in a PathView caused PathView.onPath to be set to false.Martin Jones2010-09-171-3/+5
| | | | | | | | | | | | | | | | Check that we no longer hold a reference to the item before setting onPath to false. Task-number: QTBUG-13689 Reviewed-by: Michael Brasser
| * Fix worker agent to emit ListModel itemsChanged() correctly when set()Bea Lam2010-09-171-1/+1
| | | | | | | | | | | | and setProperty() are called Task-number: QTBUG-13666
* | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-1629-283/+1304
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-162-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Check S60_VERSION instead of existence of certain files in bearer plugin Fixed EPOCROOT references in createpackage.pl. Restore 4.7.0 behavior that non-existing paths are possible. QTBUG-4852 Turning on runtime nested exception support where available Fix warnings Fixed incorrect Symbian scoping. QS60style: itemview selection indication works incorrectly
| | * Fix warningsThomas Zander2010-09-162-2/+2
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-162-72/+129
| |\ \ | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Update QtDeclarative def files Optimize FontLoader for "multi-use".
| | * | Optimize FontLoader for "multi-use".Yann Bodson2010-09-162-72/+129
| | |/ | | | | | | | | | | | | Task-number: QTBUG-13419 Reviewed-by: Michael Brasser
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-168-145/+294
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed regression in QPixmap::size() for null pixmaps. Make test less sensitive to platform specifics Doc: Further QML improvements. Doc: Minor improvements to QML-related documentation. The test livelock of QTimer is now expected to work Make sure mapSelectionFromSource does not return a selection with invalid ranges. QEventDispatcherUnix: do not process too many timer if other events need to be processed first Doc: Continued work on the QML documentation. Doc: More work on the QML documentation. Doc: More work on the declarative API documentation. Doc: Some editing and tidying up. Doc: Added a missing file. Doc: Fixed text in license headers.
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-1521-62/+118
| | |\
| | * | Doc: Further QML improvements.David Boddie2010-09-151-22/+61
| | | |
| | * | Doc: Minor improvements to QML-related documentation.David Boddie2010-09-151-2/+2
| | | |
| | * | Doc: Continued work on the QML documentation.David Boddie2010-09-141-10/+49
| | | |
| | * | Doc: More work on the QML documentation.David Boddie2010-09-141-57/+59
| | | |
| | * | Doc: More work on the declarative API documentation.David Boddie2010-09-136-54/+123
| | | |
| * | | Compile fix for static build using mingw.Michael Brasser2010-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fix follows the pattern of commit bbf78c9b422c4c7eda7e7fce067578c75d3bc9b3. Reviewed-by: Martin Jones
| * | | Models with a single role may not update due to "modelData" conflict.Martin Jones2010-09-161-10/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Models with a single role also have a modelData property added. These role names both ended up in a hash, resulting in only one or the other updating. Now we handle modelData specially. Task-number: QTBUG-13664 Reviewed-by: Michael Brasser
| * | | Fix bug in 34b805d66c09fb324d1b6a7bcf259e8743ef3894Thomas Hartmann2010-09-152-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This time the implementation of clear is correct Reviewed-by: Marco Bubke
| * | | crashfix for tst_qdeclarativeanimations::badTypes()Thomas Hartmann2010-09-152-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We always have to check for 0 before converting a raw pointer into a smart pointer Reviewed-by: Kai Koehne
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-1516-53/+845
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Compile with QT_NO_GESTURES. Give file and line error information for errors in dummydata. Restore any absolute geometry changed by AnchorChanges when returning Export QDeclarativeScriptAction Completing the interface for children/data/resources Unit tests for Bauhaus enablers This patch allows modifications on PropertyChanges on the fly
| | * | Restore any absolute geometry changed by AnchorChanges when returningMichael Brasser2010-09-151-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | to the base state. Task-number: QTBUG-11834
| | * | Export QDeclarativeScriptActionMarco Bubke2010-09-141-1/+1
| | | | | | | | | | | | | | | | It is needed in Bauhaus to disable the animation.
| | * | Completing the interface for children/data/resourcesThomas Hartmann2010-09-144-3/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch makes the handling of properties like children and data easier in Bauhaus. Especially in the case of property alias Reviewed-by: Aaron Kennedy
| | * | This patch allows modifications on PropertyChanges on the flyThomas Hartmann2010-09-1411-49/+670
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is important for Bauhaus to ensure that we can edit properties and states dynamically in the visual editor Most of the changes consist of added functions for Bauhaus, that do not affect any current behaviour. Important changes: QDeclarativeAbstractBinding is holding a QSharedPointer to itself so that other classes can hold a weak reference to avoid accessing dangling pointers while keeping track of bindings. QDeclarativeStateOperation now has its own private class QDeclarativeStateOperationPrivate to hold a pointer back to QDeclarativeState since the parent is not set correctly in every context. QDeclarativePropertyChangesPrivate does now hold a QDeclarativeGuard instead of a raw pointer to the target QObject. In Bauhaus the target object might be deleted. Reviewed-by: Aaron Kennedy