summaryrefslogtreecommitdiffstats
path: root/src/declarative/util
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-261-4/+4
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-261-4/+4
| |\ | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Run util/normalize on src/declarative.
| | * Run util/normalize on src/declarative.Yann Bodson2010-10-261-4/+4
| | |
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-251-6/+2
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-10-251-6/+2
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/doc-staging: Fixed case of a library file name to enable MinGW builds on Fedora. Doc: Made Qt::TextLongestVariant internal again. Doc: Fixed minor documentation issues. Doc: Reorganized the platform and compiler notes pages. Doc: Removed non-ASCII characters and reformatted the text. Doc: Fixed documentation style and qdoc warnings. Doc: Fixed qdoc warnings. Doc: Fixed qdoc warnings. Doc: Fixed snippet reference for the Getting Started QML guide. Doc: Fixed warnings caused by an earlier change. Made docs consistent. Doc: Fixed warnings caused by an earlier change. Made docs consistent. Doc: Renamed an external reference to work around an auto-linking issue. Doc: Fixed qdoc warnings. Doc: Fixed links to the online BSD license information. Doc: Fixed qdoc warnings. Doc: Re-added a link to the Qt site related to testing tools. Doc: Marked some new properties as internal for now. Doc: Renamed a project file. Doc: Added missing examples and snippets.
| | * Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-211-2/+3
| | |\
| | * \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-2010-15/+21
| | |\ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-142-2/+1
| | |\ \ \
| | * | | | Doc: Fixed qdoc warnings.David Boddie2010-10-071-6/+2
| | | | | |
* | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-251-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fixed many spelling errors.Rohan McGovern2010-10-251-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-2511-17/+24
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/snake/snake.qml qmake/generators/symbian/symbiancommon.cpp src/network/access/qnetworkaccessmanager.cpp src/s60installs/s60installs.pro tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| * | | | Fix network request completion crashing on a canceled pixmap requestJoona Petrell2010-10-211-2/+3
| | |_|/ | |/| | | | | | | | | | | | | | Task-number: QT-3957 reviewed-by: Aaron Kennedy
| * | | Don't export QtDeclarative symbols needed by QtCreator on SymbianJoona Petrell2010-10-1910-15/+21
| | |/ | |/| | | | | | | | | | Task-number: QTBUG-14041 Reviewed-by: Aaron Kennedy
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-152-2/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qpaintengine_raster.cpp tests/auto/declarative/qdeclarativetext/data/alignments_cb.png tests/auto/declarative/qdeclarativetext/data/alignments_cc.png tests/auto/declarative/qdeclarativetext/data/alignments_ct.png
| * | Fix worker ListModels to property emit countChanged()Bea Lam2010-10-131-1/+1
| | | | | | | | | | | | Task-number: QT-4094
| * | Remove some unnecessary includes in cpp filesAaron Kennedy2010-10-081-1/+0
| |/
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-051-1/+1
|\ \ | |/
| * Prevent crash in XmlListModel when appending an empty role.Michael Brasser2010-10-041-1/+1
| |
* | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-045-7/+55
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: doc/src/snippets/code/doc_src_qmake-manual.qdoc src/corelib/arch/symbian/arch.pri src/declarative/graphicsitems/qdeclarativeflickable.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h tests/auto/qfontmetrics/tst_qfontmetrics.cpp
| * Doc clarification.Michael Brasser2010-09-301-0/+2
| | | | | | | | Task-number: QTBUG-14053
| * Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Aaron Kennedy2010-09-293-3/+3
| | | | | | | | | | Task-number: QTBUG-13799 Reviewed-by: Martin Jones
| * Register QtQuick 1.0 module.Aaron Kennedy2010-09-291-4/+50
| | | | | | | | | | | | | | Qt 4.7 is still supported, but deprecated. Reviewed-by: Martin Jones Task-number: QTBUG-13799
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-287-49/+13
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/gui/painting/qrasterizer.cpp src/network/access/qnetworkaccessmanager.cpp tests/auto/qpainter/tst_qpainter.cpp tools/assistant/tools/assistant/mainwindow.cpp
| * Document PropertyAnimation::targets propertyBea Lam2010-09-271-1/+8
| |
| * 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.
| * Remove dead code paths in declarative list model code.Michael Brasser2010-09-234-44/+0
| | | | | | | | Reviewed-by: Bea Lam
| * Add exports for BauhausThomas Hartmann2010-09-212-2/+2
| | | | | | | | | | | | The QmlDesigner(Bauhaus) should not rely on -nokia-developer Reviewed-by: Marco Bubke
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-2117-271/+1417
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.h src/declarative/graphicsitems/qdeclarativeflickable.cpp src/declarative/graphicsitems/qdeclarativeflickable_p_p.h src/declarative/util/qdeclarativelistmodel.cpp
| * Make build on SymbianBea Lam2010-09-202-29/+33
| |
| * 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
| * 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' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-161-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-161-1/+1
| | |
| * | 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-161-28/+79
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-157-21/+63
| | |\
| | * | Doc: More work on the declarative API documentation.David Boddie2010-09-131-28/+79
| | | |
| * | | crashfix for tst_qdeclarativeanimations::badTypes()Thomas Hartmann2010-09-151-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We always have to check for 0 before converting a raw pointer into a smart pointer Reviewed-by: Kai Koehne
| * | | 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.
| * | | This patch allows modifications on PropertyChanges on the flyThomas Hartmann2010-09-147-47/+649
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
generated by cgit v0.12 at 2025-01-08 17:29:30 (GMT)