summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-292-6/+9
|\
| * Fix crash in QDeclarativePropertyMap.Michael Brasser2010-03-292-6/+9
| | | | | | | | Task-number: QTBUG-9439
* | Remove total wrongness.Warwick Allison2010-03-291-1/+0
|/ | | | Base URL of engine is not what some people think it is.
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-297-47/+443
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-295-18/+27
| |\
| | * Fix memory leak and clean up deletion.Bea Lam2010-03-291-8/+5
| | |
| | * Don't emit QDeclarativePropertyMap::valueChanged() before the value hasMichael Brasser2010-03-294-10/+22
| | | | | | | | | | | | | | | | | | changed. Task-number: QTBUG-9386
| * | Optimization: Don't use QVariant in QDeclarativeVMEMetaObjectAaron Kennedy2010-03-292-29/+416
| |/
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-294-83/+105
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/examples.qdoc doc/src/declarative/focus.qdoc doc/src/declarative/modules.qdoc doc/src/declarative/network.qdoc doc/src/declarative/qdeclarativedebugging.qdoc doc/src/declarative/qdeclarativei18n.qdoc doc/src/declarative/qmlruntime.qdoc doc/src/declarative/tutorial.qdoc tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
| * Cleanup.Michael Brasser2010-03-282-30/+8
| |
| * Don't set status to Ready until model has been created (currently thisBea Lam2010-03-282-53/+97
| | | | | | | | | | | | | | | | | | | | is set as soon as XML data is downloaded, so there is no notification when model is actually ready to be used). This also fixes data() to not crash if it is called before the model is ready. Task-number: QTBUG-7835
* | Add importPathList, mainly for doc purposes.Warwick Allison2010-03-292-10/+25
|/
* Source resizing for QDeclarativeImageProvider too.Warwick Allison2010-03-285-6/+12
| | | | (fixes test too)
* tyopWarwick Allison2010-03-281-1/+1
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-26110-1140/+3033
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (77 commits) Recompute the source location of regexp literals. Adds a way to clear the state list property in QDeclarativeStateGroup I've been told this fixes compilation on windows. Doc Augmentation Added highlight ranges/modes to PathView Use QThread IdlePriority rather than linux platform code. Test and fix order of transform application. Test transforms. Fix namespace. Simple case, no size returned. sourceWidth/sourceHeight -> sourceSize QDeclarativeItem don't need to emit childrenChanged anymore. Control of image rendered size (esp. SVG). Do not call parent implementation if we accept the keyPressEvent in GridView and ListView delegates. Update test. Add autotest for QTBUG-9367. Remove Q prefix from the validators. Really fix qMin() parameter types. Add declarative subdir to examples.pro Add Symbian deploy section for qml import plugins ...
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-26110-1140/+3033
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (77 commits) Recompute the source location of regexp literals. Adds a way to clear the state list property in QDeclarativeStateGroup I've been told this fixes compilation on windows. Doc Augmentation Added highlight ranges/modes to PathView Use QThread IdlePriority rather than linux platform code. Test and fix order of transform application. Test transforms. Fix namespace. Simple case, no size returned. sourceWidth/sourceHeight -> sourceSize QDeclarativeItem don't need to emit childrenChanged anymore. Control of image rendered size (esp. SVG). Do not call parent implementation if we accept the keyPressEvent in GridView and ListView delegates. Update test. Add autotest for QTBUG-9367. Remove Q prefix from the validators. Really fix qMin() parameter types. Add declarative subdir to examples.pro Add Symbian deploy section for qml import plugins ...
| | * Recompute the source location of regexp literals.Roberto Raggi2010-03-262-2/+14
| | | | | | | | | | | | Task-number: QTBUG-9367
| | * Adds a way to clear the state list property in QDeclarativeStateGroupKai Koehne2010-03-261-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | Needed by QmlDesigner, which needs to be able to remove states at runtime. Done my Marco Bubke Reviewed-by: Michael Brasser
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-264-57/+281
| | |\
| | | * Added highlight ranges/modes to PathViewMartin Jones2010-03-264-57/+281
| | | | | | | | | | | | | | | | Task-number: QT-319
| | * | I've been told this fixes compilation on windows.Alan Alpert2010-03-261-1/+1
| | | |
| | * | Doc AugmentationAlan Alpert2010-03-261-1/+3
| | | | | | | | | | | | | | | | Task-number: QTBUG-9396
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-26204-3495/+8821
| | |\ \ | | | |/
| | | * Use QThread IdlePriority rather than linux platform code.Martin Jones2010-03-261-14/+1
| | | | | | | | | | | | | | | | Task-number: QTBUG-9032
| | | * Test and fix order of transform application.Warwick Allison2010-03-265-37/+26
| | | | | | | | | | | | | | | | Remove Translate.z since Qt cannot sensibly support it yet.
| | | * Fix namespace.Warwick Allison2010-03-261-1/+3
| | | |
| | | * Simple case, no size returned.Warwick Allison2010-03-261-1/+1
| | | | | | | | | | | | | | | | Fixes Particles plugin.
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-261-4/+0
| | | |\
| | | | * QDeclarativeItem don't need to emit childrenChanged anymore.Alexis Menard2010-03-261-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's done by QGraphicsItemPrivate::addChild and removeChild. Reviewed-by:akennedy
| | | * | sourceWidth/sourceHeight -> sourceSizeWarwick Allison2010-03-264-47/+24
| | | |/
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-2610-18/+64
| | | |\
| | | | * Do not call parent implementation if we accept the keyPressEvent in GridView ↵Yann Bodson2010-03-262-6/+6
| | | | | | | | | | | | | | | | | | | | and ListView delegates.
| | | | * Remove Q prefix from the validators.Michael Brasser2010-03-263-11/+13
| | | | |
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-264-0/+44
| | | | |\
| | | | | * Add Symbian deploy section for qml import pluginsJoona Petrell2010-03-264-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9364 Reviewed-by: jbarron
| | | | * | Really fix qMin() parameter types.Martin Jones2010-03-261-1/+1
| | | | |/
| | | * | Control of image rendered size (esp. SVG).Warwick Allison2010-03-2612-78/+514
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Add Translate transform. Image::sourceWidth and Image::sourceHeight read/write properties. Task-number: QTBUG-8984
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-262-0/+167
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-26183-3430/+8151
| | | | |\
| | | | * | Add missing files from 72599ca45c416f2f0a9654412c14a148ca3d728cAaron Kennedy2010-03-262-0/+167
| | | | | |
| | | * | | Document Particles module import.Martin Jones2010-03-261-0/+5
| | | | |/ | | | |/|
| | | * | Remove some Script {} docsMartin Jones2010-03-254-105/+12
| | | | |
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-254-27/+9
| | | |\ \
| | | | * | Fix where data() is called before xml is loaded. Also add status tests.Bea Lam2010-03-251-2/+4
| | | | | |
| | | | * | Clean upBea Lam2010-03-251-20/+0
| | | | | |
| | | | * | Remove int parameter from ListModel countChanged() to be consistentBea Lam2010-03-253-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | with other classes with countChanged() signals.
| | | * | | Ensure both qMin() parameters are the same type.Martin Jones2010-03-251-1/+1
| | | |/ /
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-25173-3288/+8120
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp
| | * | \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-252-9/+9
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-2583-900/+2047
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (47 commits) Optimize QML "parent" property access Begin dragging PathView up to the level (quality and functionality) of other views. Rename qdeclarativetime -> qmltime Auto-test fix. Build Fix and port to new width and height properties Port Flickable and Flipable to support QGraphicsObject. Protect the QDeclarativeListProperty used in QGraphicsItem with ifdef Fix the build due to new properties in QGraphicsObject. Remove the children property from QDeclarativeItem. Rename qdeclarativetime -> qmltime Update AnchorChanges to use more natural form for setting anchors. Pen is not a creatable type. Begin dragging PathView up to the level (quality and functionality) of other views. Fix error reporting when symbian file copy fails. Stabilize QGraphicsEffect test on X11 QIODevice::read() and QFile::atEnd() performance improvements Clarified pkg_prerules usage documentation. Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( aa40cdb9595eb15a68e7be03322f973aa613a8f9 ) Made it possible to define more than one language using pkg_prerules Symbian QAudioOutput::suspend() was resetting processedUSecs() to zero ...
generated by cgit v0.12 at 2024-09-24 02:22:28 (GMT)