summaryrefslogtreecommitdiffstats
path: root/src/declarative/util
Commit message (Collapse)AuthorAgeFilesLines
* Fix crash on exit when overriding signal handlers in states.Michael Brasser2011-10-171-2/+3
| | | | | | Change-Id: I0e73948f18aa1b78c7e92677167673b84a90a450 Task-number: QTBUG-21617 Reviewed-by: Martin Jones
* Fix leak in State element.Michael Brasser2011-09-021-0/+12
| | | | | | | If a state was destroyed while active, it would leak bindings. Task-number: QTBUG-21194 Reviewed-by: Aaron Kennedy
* Fix memory leak in ListModel custom parserBea Lam2011-09-011-0/+1
| | | | | | | | | | | | ModelNodes created by the parser for ListElement definitions were not deleted. (Commit backported from c1491c356f3cca92a359468ce37f38bc1873eec4 in qt-qml-staging) Task-number: QTBUG-21084 Change-Id: I36ca0ffba1a94355abe42a95e49723548d9a575a Reviewed-by: Michael Brasser
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-06-042-0/+16
|\ | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Revert some of "Make QMLViewer startup animation stop after a while" Add private method for flushing the pixmap cache.
| * Add private method for flushing the pixmap cache.Michael Brasser2011-06-022-0/+16
| | | | | | | | | | Change-Id: I7330383b89a3a313dd845274d17d38c714db20ce Reviewed-by: Martin Jones
* | Update licenseheader text in source filesJyri Tahtela2011-05-1363-1072/+1072
|/ | | | | | | 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-s60-public into ↵Qt Continuous Integration System2011-04-261-3/+1
|\ | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Set QPixmapCache default limit to 10MB on Symbian.
| * Set QPixmapCache default limit to 10MB on Symbian.Jani Hautakangas2011-04-261-3/+1
| | | | | | | | | | | | | | | | | | Cache limit can be changed to 10MB since QPixmaps on Symbian are not consuming process heap anymore. QPixmaps are reserved from FBServ heap. Task-number: QTBUG-18568 Reviewed-by: Laszlo Agocs
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-151-39/+28
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: QmlDebug: Fix license headers in new ost plugin Fixed autotest after b4b85257ccff6ba21bcbcbd46a9f7f09884abe79 Resolve unqualified attached properties correctly Adding plugin qmltooling/qmlostplugin for QML debugging over OST (USB) on Symbian. QmlDebug: Rename 'tcpserver' library to 'qmldbg_tcp' QDeclarativeDebug: Don't crash when connection is closed Fix so concurrent jobs produce the correct model results Fix uninitialized variable.
| * | Fix so concurrent jobs produce the correct model resultsBea Lam2011-04-141-39/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Concurrent jobs sometimes modified another job's results as results were stored in member variables and modified without locks. This change removes the use of member variables for the current job, and uses QAtomicInt for the incremented job ids. (Regression from 4df66da8f9e5a9f3c981c6c60254899146dd1cc0) Task-number: QTBUG-18266 Change-Id: Ia6783e9d17603e0ff5ccd40d8cc992bdc2d3f0e9 Reviewed-by: Charles Yin
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-121-3/+0
|\ \ \ | |/ / | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Allow enum values to be used as signal parameters ListModel::clear() should not clear roles
| * | ListModel::clear() should not clear rolesBea Lam2011-04-121-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clearing a model and then appending a new object with a subset of the previous roles was causing a crash since ListModel cleared the roles and VisualDataModel did not, so VisualDataModel was requesting invalid roles. This could have been fixed by clearing the meta object and its property cache in in VisualDataModel but this is less efficient, and also the general use case is for model data to always have the same roles. Task-number: QTBUG-18587 Change-Id: Ib11d2292888ab7a41e772b1e11700cd665e94ae7 Reviewed-by: Michael Brasser
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-042-3/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix failing autotest XmlListModel should allow types other than application/xml Document using Behaviors with States.
| * | XmlListModel should allow types other than application/xmlBea Lam2011-04-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | application/xml is the most appropriate content type but some servers may use other types, e.g. text/xml, so allow */* as a fallback. Task-number: QTBUG-18005 Change-Id: I0442148233e06aacb2cbfaaf7ae624ba733d5f9a Reviewed-by: Michael Brasser
| * | Document using Behaviors with States.Michael Brasser2011-04-041-2/+3
| | | | | | | | | | | | | | | | | | Change-Id: I74f163cef8caa16cccb158061ec30ffb4e471fd1 Task-number: QTBUG-16856 Reviewed-by: Bea Lam
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-011-1/+2
|\ \ \ | |/ / | | / | |/ |/| | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Add missing test file. Changing width of RTL positioner doesn't relayout Fix TextInput auto test failure on mac. PinchArea and Flickable don't work well enough together Fix auto test failure. Once Image sourceSize is set there is no way to clear it. Rotation transform with NaN angle can cause crash Canceling image download while reading causes crash Fix width of TextInput micro focus rectangle.
| * Canceling image download while reading causes crashMartin Jones2011-03-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We were deleting a QObject owned by another thread, which is fine if there are no pending events, but very bad if there are, e.g. queued signals due to downloadProgress() updates. Use deleteLater() which is safe to call in any thread. Also call QDeclarativePixmap::clear(QObject *obj) where appropriate to remove connections and ensure we don't handle any unwanted signals after the download is cancelled. Change-Id: Ia8fb41a8cd004d9840e7cec35915f1afdb03ac4d Task-number: QTBUG-18412 Reviewed-by: Aaron Kennedy
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-03-2711-136/+139
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (185 commits) qdoc: Avoid infinite loops in table of contents generation. Removed the documentation from the install rule. qdoc: Added the <othermeta> element. qdoc: Completed changing <section> structure. Doc: Fixed reference to absolete API in exceptionsafety.html Doc: Removed links to obsolete API in QResource Doc: Fixed broken links in QIcon::fromTheme() Doc: Fixed doc bug in undo framework example Doc: Fixed typo. qdoc: Changed <section> structure. Doc: Typo fixes Doc: Fixed snippet documenting QMetaObject::classInfo Doc: Cannot alter SelectionMode of a combobox's view qdoc: Added <publisher> and <permissions> elements. qdoc: Added <component> element to contain the module name. qdoc: Added <prodinfo> element and its contents to the metadata. Doc: Fixed a doc bug in the Rogue example Doc: Small change to QByteArray::resize() Doc: Small change to ListModel docs Doc: QtDemo now gives error message when example doc cannot be loaded ...
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-221-0/+7
| |\ | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/declarativeui.qdoc doc/src/examples/qml-examples.qdoc
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-092-8/+21
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/dynamicobjects.qdoc doc/src/declarative/elements.qdoc
| * | | Doc: Small change to ListModel docsGeir Vattekar2011-03-071-1/+1
| | | | | | | | | | | | | | | | Task-number: QTBUG-16948
| * | | Merge branch 'mimir' into 4.7Martin Smith2011-03-011-1/+1
| |\ \ \
| | * | | qdoc: Added more descriptions for QML commands.Martin Smith2011-03-011-1/+1
| | | | |
| * | | | Merge commit 'refs/merge-requests/1108' of git://gitorious.org/qt/qt into ↵David Boddie2011-02-235-97/+90
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | merge-requests/1108 Conflicts: doc/src/declarative/basictypes.qdoc
| * | | | Merge branch 'mimir' into 4.7David Boddie2011-02-231-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/qdeclarativemodels.qdoc doc/src/index.qdoc doc/src/template/style/style.css tools/qdoc3/atom.h tools/qdoc3/doc.cpp tools/qdoc3/doc/qdoc-manual.qdoc tools/qdoc3/doc/qdoc-manual.qdocconf
| | * | | | qdoc: Fixed some validation errors in the DITA filesMartin Smith2011-01-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | 11 instances of raw-html remain.
| | * | | | Merge branch '4.7' into mimirDavid Boddie2010-12-151-2/+2
| | |\ \ \ \
| * | | | | | Doc: Fixed links and whitespace.David Boddie2011-02-175-13/+14
| | | | | | |
| * | | | | | 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
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ 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
| * | | | | | | | 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 scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-01-052-23/+5
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merging qt-doc-team into cloned repository
| * | | | | | | | | | Re-organized the Qt Quick page. Changed titles and links.Jerome Pasion2010-12-206-122/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
* | | | | | | | | | | Fix memory leak.Martin Jones2011-03-241-0/+2
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I919935399ee1b0e505c85781d481d17345df25c9 Task-number: QT-4330 Reviewed-by: Michael Brasser
* | | | | | | | | | QDeclarativeView flickers when composited on MeeGoMartin Jones2011-03-171-0/+7
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set Qt::WA_OpaquePaintEvent and Qt::WA_NoSystemBackground for QDeclarativeView on meego. Change-Id: I301d2381ae831485d205ff42b0c15b3fa7a73424 Task-number: QTBUG-17173 Reviewed-by: Michael Brasser
* | | | | | | | | QDeclarativePropertyMap::keys() cannot be called from qmlCharles Yin2011-03-032-8/+21
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not allow create dynamic properties which are same with existing method (method, signal, slot) names. Change-Id: I0ae64c8a6a89ef4f7614169088f7c005edad40b0 Task-number:QTBUG-17868 Reviewed-by:Martin Jones
* | | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7Joona Petrell2011-02-2210-132/+102
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qml/qml.pri
| * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-02-201-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (21 commits) Autotest: make at least one update before checking if more are needed Fix warning about id maybe used when uninitialised Doc: setSslConfiguration also sets the CA certificates Autotest: check that the type received is the expected one Attempt to fix symbian 3.1 and 3.2 compile break. Prevents crashing when ICO file has bad color table value directfb: fix crash in client/server mode of qws Make Qt/DirectFB less verbose about failing to load pixmaps. Autotest: don't use the deprecated signal from QDBusConnectionInterface Autotest: be nicer to the subprocess and SIGTERM it Fix warnings in QtDeclarative Autotest: avoid memory leaks if test fails QtDBus: Make sure we can receive unknown types QtDBus meta object: keep methods, signals and props with unknown types Autotest: add a new test for parsing an introspection with unknown types Make the QtDBus parser not complain about unknown things fix-layer-getsurface-result-check-for-screen-size-determination Bump QtWebKit version to 2.0.2 SSL: fix memory leak when loading certificates on Mac OS X Add a mutex to protect the access to the QSet. ...
| | * | | | | | | | Fix warning about id maybe used when uninitialisedThiago Macieira2011-02-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code would indicate it's never used uninitialised, but gcc doesn't know it.
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-181-90/+80
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix TextEdit auto test failure on windows. Fix FocusScope example. Fix compilation on old Symbian platforms Export symbols from qtestlib required for QtQuickTest Allow MouseArea to prevent mouse grab begin stolen by Flickable. Fix QTBUG-17008 XmlListModel blocks Windows system events Fix TextInput, TextEdit auto test failure on windows and mac. QDeclarativeDebug: Fix crash when serializing list of QObjects Update the input context when the pre-edit cursor position changes.
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-02-049-131/+101
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | / / / | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (216 commits) Doc: Fixed a reference to the wrong image. Fixed a bug that caused marked up inline text to be truncated. Doc: Renamed an image to ensure that it does not clash with another. Doc: Fixed QML, unindented snippet. Doc: Removed unnecessary HTML entity from the title. Doc: Fixed broken links to the old Symbian Foundation Wiki. Doc: Updated the copyright statements in the templates. Doc: Fixing typo Replace all occurances of "Qt 4.7" with "QtQuick 1.0" Doc: Adjusted the font sizes for the offline documentation. Doc: Added a missing style sheet to the qhp manifest. Doc: Fixed the qthelp namespace for the Qt documentation. Doc: including missing pages in overviews. Doc: Fixed typo in QCoreApplication docs Fixed whitespace. Avoid hard-coding product names in page titles. Doc: Unindented a code snippet. Doc: Fixed confusing wording of a sentence. Doc: Fixed a broken link. Doc: Updated the information about commercial editions of Qt. ...
| | * | | | | | | 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
| | | | |_|_|/ / / | | | |/| | | | |
generated by cgit v0.12 at 2024-11-07 15:02:18 (GMT)