summaryrefslogtreecommitdiffstats
path: root/src/declarative/util
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-02-151-0/+2
|\
| * Doc: Ensured that code snippets have appropriate file names.David Boddie2011-02-081-0/+2
| | | | | | | | | | This helps them to be marked up correctly in cases where code markers are available.
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-02-0720-206/+505
|\ \ | |/ | | | | | | | | Conflicts: doc/src/declarative/propertybinding.qdoc src/declarative/util/qdeclarativeview.cpp
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-02-0420-205/+504
| |\
| | * Move Qt.application docs into Qt global object pageBea Lam2011-02-021-50/+3
| | | | | | | | | | | | | | | | | | Previously it was documented as a separate 'Application' element Reviewed-by: Martin Jones
| | * Froze two more symbols and fixed compilation error (QtQuick11).juhvu2011-02-021-2/+2
| | | | | | | | | | | | Reviewed-by: Martin Jones
| | * Change Qt.application.layoutDirection from bool to correct type of ↵Joona Petrell2011-01-192-4/+13
| | | | | | | | | | | | | | | | | | | | | Qt::LayoutDirection Task-number: QTBUG-16424 Reviewed-by: Martin Jones
| | * Rename Image::cached to 'cached' (and QDeclarativePixmap::Cached also)Bea Lam2011-01-192-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | This is to keep consistent property naming consistent. E.g. Image has 'smooth', 'mirror' properties rather than 'smoothed', 'mirrored'. For consistency QDeclarativePixmap::Cached was renamed as well. Reviewed-by: Martin Jones
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-1960-60/+60
| | |\
| | * | Fix QtDeclarative compilation warningsJoona Petrell2011-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Martin Jones
| | * | set() and setProperty() should not always trigger change signalsBea Lam2011-01-115-42/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix set() and setProperty() to only trigger itemsChanged(), and the the <property>Changed signals for items returned by get(), if the new value is different from the old one. The exception to this are list values, as it is inefficient to check the sublists and also the model classes are due to be revised. This also fixes models used with a WorkerScript to emit itemsChanged() with the correct roles. Task-number: QTBUG-14620 Reviewed-by: Michael Brasser
| | * | Add missing Qt namespaces macros to qdeclarativeapplication.cpp source fileJoona Petrell2011-01-071-0/+4
| | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Aaron Kennedy
| | * | Add layoutDirection property to Qt.application elementJoona Petrell2011-01-072-2/+33
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16424 Reviewed-by: Martin Jones
| | * | Introduce Qt.application.active propertyJoona Petrell2011-01-074-0/+206
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaces qmlviewer's runtime.activeWindow property. Task-number: QTBUG-13351 Reviewed-by: Martin Jones
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-073-7/+9
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
| | * \ \ Merge branch 'qtquick11' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-051-1/+6
| | |\ \ \
| | | * | | Fix translation in Connections element.Michael Brasser2011-01-041-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide the component's file name to the expression as the translation context. Task-number: QTBUG-10300 Reviewed-by: Martin Jones
| | * | | | Support property/method versions in QMLMartin Jones2011-01-051-1/+0
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use metaobject revisioning to exclude properties/revisions added in later versions from interfering with earlier versions. Task-number: QTBUG-13451 Reviewed-by: Aaron Kennedy
| | * | | Fix results of number() queries for zero and non-number valuesBea Lam2011-01-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use xs:string() to test whether a value is empty, instead of using a simple boolean check which fails for zero-type values. This fix also means 'NaN' is returned for non-number (including empty) values. Task-number: QTBUG-16423, QTBUG-16265 Reviewed-by: Michael Brasser
| | * | | Fix potential crash in PropertyChanges binding rewrite handling.Michael Brasser2010-12-211-27/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the autotest regression for tst_qdeclarativestates::editProperties introduced by 488e616b50707e5b37162e6d0cfc71a1ffdf9bef. Reviewed-by: Joona Petrell
| | * | | Optimize QByteArray to QString conversion in PropertyChanges.Michael Brasser2010-12-214-64/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Perform the conversion once at compile time, rather than many times later. Task-number: QTBUG-15331 Reviewed-by: Martin Jones
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Joona Petrell2010-12-201-2/+2
| | |\ \ \
| | * | | | ParentChange optimizations.Michael Brasser2010-12-171-36/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QDeclarativeScriptStrings used for the properties are unlikely to change, so we immediately attempt to convert to a real value, rather than converting every time actions() is called. Task-number: QTBUG-15331 Reviewed-by: Martin Jones
| | * | | | Rewrite/cache bindings created by PropertyChanges.Michael Brasser2010-12-171-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This provides a significant optimization for initial evaluation of bindings specified in a PropertyChanges. Reviewed-by: Aaron Kennedy
| | * | | | Optimize construction of QDeclarativeProperty in state operations.Michael Brasser2010-12-172-30/+35
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Martin Jones
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2010-12-011-1/+1
| | |\ \ \ \
| | * | | | | Fix ListModel::set() to update the model cache when setting a list valueBea Lam2010-11-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15190
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Yann Bodson2010-11-231-0/+2
| | |\ \ \ \ \
| | * | | | | | Add 'cached' property to Image elementYann Bodson2010-11-122-12/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting cached to false is useful when dealing with large images, to make sure that they aren't cached at the expense of small 'ui element' images. Task-number: QTBUG-7300 Reviewed-by: Aaron Kennedy
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Yann Bodson2010-11-1210-29/+44
| | |\ \ \ \ \ \
| | * | | | | | | Make it possible to add your own graphics scene to QDeclarativeViewJoona Petrell2010-11-031-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14771 Reviewed-by: Martin Jones
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-02-048-104/+92
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/extending.qdoc doc/src/external-resources.qdoc src/declarative/util/qdeclarativeanimation.cpp src/declarative/util/qdeclarativetransition.cpp
| * | | | | | | | Doc: Fixed qdoc warnings about broken links.David Boddie2011-01-262-2/+2
| | | | | | | | |
| * | | | | | | | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-262-11/+16
| | | | | | | | |
| * | | | | | | | Doc: Fixed broken QML code snippets.David Boddie2011-01-251-0/+2
| | | | | | | | |
| * | | | | | | | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-242-25/+36
| | | | | | | | |
| * | | | | | | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2011-01-2160-145/+96
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp src/declarative/util/qdeclarativeanimation.cpp
| | * | | | | | | | Doc: Fixed invalid/incomplete QML code snippets.David Boddie2011-01-173-64/+34
| | | | | | | | | |
| * | | | | | | | | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-212-4/+6
| | | | | | | | | |
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-01-1760-60/+61
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/elements.qdoc doc/src/declarative/extending.qdoc src/declarative/qml/qdeclarativecomponent.cpp
| * | | | | | | | | Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-1360-60/+61
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/qdeclarativeintro.qdoc doc/src/declarative/qdeclarativereference.qdoc doc/src/snippets/declarative/focus/focusColumn.qml tools/qdoc3/apigenerator.cpp tools/qdoc3/apigenerator.h tools/qdoc3/archiveextractor.cpp tools/qdoc3/bookgenerator.cpp tools/qdoc3/bookgenerator.h tools/qdoc3/ccodeparser.cpp tools/qdoc3/command.cpp tools/qdoc3/command.h tools/qdoc3/cpptoqsconverter.cpp tools/qdoc3/dcfsection.cpp tools/qdoc3/dcfsection.h tools/qdoc3/jambiapiparser.cpp tools/qdoc3/jambiapiparser.h tools/qdoc3/javacodemarker.cpp tools/qdoc3/javacodemarker.h tools/qdoc3/javadocgenerator.cpp tools/qdoc3/javadocgenerator.h tools/qdoc3/linguistgenerator.cpp tools/qdoc3/linguistgenerator.h tools/qdoc3/loutgenerator.h tools/qdoc3/mangenerator.cpp tools/qdoc3/mangenerator.h tools/qdoc3/polyarchiveextractor.cpp tools/qdoc3/polyarchiveextractor.h tools/qdoc3/polyuncompressor.cpp tools/qdoc3/polyuncompressor.h tools/qdoc3/qsakernelparser.cpp tools/qdoc3/qscodemarker.cpp tools/qdoc3/qscodemarker.h tools/qdoc3/qscodeparser.cpp tools/qdoc3/qscodeparser.h tools/qdoc3/sgmlgenerator.cpp tools/qdoc3/sgmlgenerator.h tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/uncompressor.cpp tools/qdoc3/webxmlgenerator.cpp tools/qdoc3/webxmlgenerator.h
| | * | | | | | | | Update copyright year to 2011.Jason McDonald2011-01-1060-60/+60
| | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | | | | | XmlListModel requests should set 'Accept' header to 'application/xml'Bea Lam2010-12-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15836 Reviewed-by: Michael Brasser
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-01-052-23/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | Merging qt-doc-team into cloned repository
| * | | | | | | | Doc: Fixed QML syntax in quoted code snippets.David Boddie2010-12-212-23/+5
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Re-organized the Qt Quick page. Changed titles and links.Jerome Pasion2010-12-206-122/+122
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
* | | | | | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-151-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-141-2/+2
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Clarify that XmlListModel is read onlyBea Lam2010-12-141-2/+2
| | | |_|_|/ | | |/| | |
* | | | | | Doc: Used div elements for floats, updated the style sheet.David Boddie2010-12-141-2/+6
| | | | | |