summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make qml debugging work with command line argumentsLasse Holmstedt2010-09-1710-20/+114
| | | | | | | | | | 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-1715-214/+947
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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()
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-1715-214/+947
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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()
| | * Fix example after changes to font.letterSpacing.Yann Bodson2010-09-171-1/+2
| | |
| | * Autotest and small fix for QDeclarativeFontLoader.Yann Bodson2010-09-173-5/+43
| | |
| | * Improve error messagesBea Lam2010-09-172-7/+7
| | |
| | * Changes to objects returned from get() should emit itemsChanged() soBea Lam2010-09-176-58/+698
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-173-11/+21
| | | | | | | | | | | | | | | | | | | | | | | | 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' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-1753-546/+885
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (45 commits) Doc: css fine tuning Doc: Fixed a non-compiling example. Doc: removing linebreak Doc: correcting html template Doc: Updated What's new in 4.7 page Doc: Updated What's new in 4.7 page Doc: Removing google analytics from offline docs Doc: fixing creator bug in page footer Doc: correcting html template - validating Doc: fixing issues with table indent - css Doc: Fixing style: line height, ol indent, coulmns (css3) Doc: correcting html template Doc: Updated the Mac requirements page. Doc: Cleaning up the known issues page. Pointing people to check the online resources. Added a QFormLayout snippet to the layout.qdoc and layouts.cpp Doc: Removing section about Multimedia - playback and declarative elements. This was descoped from Qt 4.7. Doc: Listed undoable operations in QTextDocument Revert "Doc: fixing page name bug caused by 07bbace404078dcfd82eff717daa97299b8ba52c changing qml elements page" Doc: Note on updating proxy models with dynamic sort filters qdoc: Fixed an html formatting error in the QML property list. ...
| * | Merge commit 'staging-1/4.7' into fridayMorten Engvoldsen2010-09-174-14/+16
| |\ \
| * | | Doc: css fine tuningMorten Engvoldsen2010-09-171-3/+3
| | | |
| * | | Merge branch '4.7' into fridayMorten Engvoldsen2010-09-17362-4120/+3252
| |\ \ \
| | * \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-16356-4102/+3214
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Doc: Fixed a non-compiling example.David Boddie2010-09-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tested with namespaced and non-namespaced Qt builds. Reviewed-by: Trust Me
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-09-1690-517/+3581
| | |\ \ \
| | * \ \ \ Merge branch '4.7' of ../qt-doc-team into 4.7David Boddie2010-09-14238-5528/+10285
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'fixesfor4.7' into 4.7David Boddie2010-09-13229-3261/+8303
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/tutorials/modelview/3_changingmodel/mymodel.h
| | | * | | | | moving tutorials out of gitignore. Reviewed by Robert GrieblRoland Wolf2010-09-081-0/+1
| | | | | | | |
| | | * | | | | small fixes on the modelview tutorialRoland Wolf2010-09-081-11/+19
| | | | | | | |
| | | * | | | | minor formatting fixRoland Wolf2010-09-082-2/+2
| | | | | | | |
| | | * | | | | fix for compilation with namespaceRoland Wolf2010-09-082-2/+2
| | | | | | | |
| | | * | | | | minor formatting fixRoland Wolf2010-09-082-2/+2
| | | | | | | |
| | | * | | | | fix for compilation with namespaceRoland Wolf2010-09-084-6/+22
| | | | | | | |
| | * | | | | | compilation with namespaces was broken. fixedRoland Wolf2010-09-062-3/+1
| | | | | | | |
| | * | | | | | Merge remote branch 'upstream/4.7' into 4.7Roland Wolf2010-09-06280-4099/+12074
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '4.7' of ↵Roland Wolf2010-09-0240-858/+541
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/msculls-modelview-qdoc-enhancement into 4.7
| * | | | | | | | | Doc: removing linebreakMorten Engvoldsen2010-09-161-1/+0
| | | | | | | | | |
| * | | | | | | | | Doc: correcting html templateMorten Engvoldsen2010-09-161-12/+3
| | | | | | | | | |
| * | | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into doc-4.7Morten Engvoldsen2010-09-160-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | * | | | | | | | Doc: Updated What's new in 4.7 pageGeir Vattekar2010-09-161-1/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Henry Haverinen
| * | | | | | | | | Doc: Updated What's new in 4.7 pageGeir Vattekar2010-09-161-1/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Henry Haverinen
| * | | | | | | | | Merge branch '13092010doc' into doc-4.7Morten Engvoldsen2010-09-162-24/+58
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/test/qt-html-templates.qdocconf
| | * | | | | | | | | Doc: Removing google analytics from offline docsMorten Engvoldsen2010-09-162-15/+5
| | | | | | | | | | |
| | * | | | | | | | | Doc: fixing creator bug in page footerMorten Engvoldsen2010-09-161-1/+8
| | | | | | | | | | |
| | * | | | | | | | | Doc: correcting html template - validatingMorten Engvoldsen2010-09-161-1/+1
| | | | | | | | | | |
| | * | | | | | | | | Doc: fixing issues with table indent - cssMorten Engvoldsen2010-09-161-3/+3
| | | | | | | | | | |
| | * | | | | | | | | Doc: Fixing style: line height, ol indent, coulmns (css3)Morten Engvoldsen2010-09-161-16/+43
| | | | | | | | | | |
| | * | | | | | | | | Doc: correcting html templateMorten Engvoldsen2010-09-161-28/+22
| | |/ / / / / / / /
| * | | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into doc-4.7Morten Engvoldsen2010-09-169-142/+113
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-09-166-141/+90
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Doc: Cleaning up the known issues page. Pointing people to check the online ↵Morten Engvoldsen2010-09-161-120/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resources.
| | | * | | | | | | | Added a QFormLayout snippet to the layout.qdoc and layouts.cppJerome Pasion2010-09-162-5/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie Tasks: QTBUG-10077
| | | * | | | | | | | Doc: Removing section about Multimedia - playback and declarative elements. ↵Morten Engvoldsen2010-09-161-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was descoped from Qt 4.7.
| | | * | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-152-7/+32
| | | |\ \ \ \ \ \ \ \
generated by cgit v0.12 at 2024-12-04 22:24:27 (GMT)