summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Replace "import Qt 4.6" with "import Qt 4.7"Michael Brasser2010-04-08183-196/+196
|
* Don't optimized extended type constructionAaron Kennedy2010-04-083-1/+9
|
* Correctly handle shutdown order in the presence of QWidgetsAaron Kennedy2010-04-081-1/+1
| | | | | The QWidget destructor is largely a copy of the QObject destructor. QML shutdown occurs in a slightly different order in this case.
* Initialize QDeclarativeData even when not using a QDeclarativeEngineAaron Kennedy2010-04-082-5/+14
| | | | Caused crashes in various test cases
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-0814-46/+76
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-0811-301/+286
| |\
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-0819-615/+242
| |\ \
| * | | Replace Text::wrap property with Text::wrapMode enumeration.Martin Jones2010-04-0814-46/+76
| | | | | | | | | | | | | | | | wrap remains for a little while, and will produce a warning.
* | | | Remove usage of Script where not actually testing the obsolete construct.Warwick Allison2010-04-081-4/+3
| | | |
* | | | Test import of a script requires qualifier.Warwick Allison2010-04-083-0/+6
| | | |
* | | | Fix location of error message.Warwick Allison2010-04-081-2/+2
| | | |
* | | | Remove error-tests of obsolete Script element.Warwick Allison2010-04-0825-120/+0
| |_|/ |/| |
* | | Remove usage of Script where not actually testing the obsolete construct.Warwick Allison2010-04-081-3/+1
| | |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-089-55/+89
|\ \ \ | | |/ | |/|
| * | Revert "Add QListModelInterface::modelReset() signal and emit this in"Bea Lam2010-04-086-43/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 973cfce37fcdd1ce330f237eaa76930db55a73f6. Need more consideration before adding modelReset(). For example if item insertion/removal is supposed to trigger animations through added/removed signals, they won't be triggered if only the modelReset() signal is emitted. Also if we add modelReset(), it should also be implemented for ListModel to make sure it is implemented by all subclasses of QListModelInterface and to test the impact of this on the view classes.
| * | Prevent Behavior from being triggered on initialization.Michael Brasser2010-04-083-12/+43
| | | | | | | | | | | | Task-number: QTBUG-6332
* | | Remove usage of Script where not actually testing the obsolete construct.Warwick Allison2010-04-088-293/+279
| | |
* | | Pass again, now that version must exist in order to be imported.Warwick Allison2010-04-082-5/+6
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-0817-511/+154
|\ \
| * | Remove flickr-desktopYann Bodson2010-04-086-500/+1
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-0819-301/+118
| |\
| | * Revert "Support QList<QObject*> properties"Aaron Kennedy2010-04-0816-297/+70
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9d9161446bfad883c298d54a122e822c5e273a9c. This was a bad idea. It complicates the "property var" are not really JavaScript var problem. Some of the patch is valid, and it will be applied separately.
| | * Document behavior of conflicting when clauses.Michael Brasser2010-04-083-4/+48
| | | | | | | | | | | | Task-number: QTBUG-9371
| * | Don't emit clicked() after pressAndHold()Martin Jones2010-04-083-1/+45
| |/ | | | | | | Task-number: QTBUG-9676
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-0817-75/+311
| |\
| | * Support QList<QObject*> propertiesAaron Kennedy2010-04-0816-70/+297
| | | | | | | | | | | | | | | | | | | | | We already supported returning QList<QObject*> from methods, but there wasn't really much that could be done with the return value. This closes the loop on QList<QObject*> support by allowing them to be properties, and used as models.
| * | Fix setting of pointSize and pixelSize in different items.Martin Jones2010-04-085-6/+60
| | | | | | | | | | | | | | | | | | | | | Also ensure warning is issued regardless of the order both pointSize and pixelSize are set in the same item. Task-number: QTBUG-9665
* | | Give error if attempt to import from a version that is not installed.Warwick Allison2010-04-082-3/+20
| | | | | | | | | | | | | | | | | | (was done for builtins/plugins, but now also for qmldir-specified content) Task-number: QTBUG-9627
* | | Test actual error messages. Fix error messages. Test module-not-available error.Warwick Allison2010-04-082-59/+133
| | |
* | | needs focusWarwick Allison2010-04-081-0/+1
| |/ |/|
* | Update Repeater docs.Michael Brasser2010-04-071-5/+14
|/
* Build on Windows.Martin Jones2010-04-071-1/+6
|
* Visual test updates.Michael Brasser2010-04-0711-3/+36
|
* Make sure tests cleanup after themselves.Michael Brasser2010-04-073-3/+67
|
* Make sure Loader doesn't leak when component has errors.Michael Brasser2010-04-071-3/+3
|
* Cleanup (remove QDeclarativeScriptClass)Aaron Kennedy2010-04-0713-142/+34
| | | | | QDeclarativeScriptClass only existed to make compiling against 4.6 and 4.7 easier.
* Disallow nested elements in ListModelAaron Kennedy2010-04-073-4/+14
| | | | QTBUG-6082
* Fix warningMartin Jones2010-04-071-1/+1
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-0712-178/+159
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-0735-278/+562
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Cleanup minehunt example Keep track of the item count to avoid calling model->count() during batched changes Allow iteration over the Item.children property Add QListModelInterface::modelReset() signal and emit this in Compile Allow MouseArea.Drag.target to be reset. Document MouseEvent.accepted. Initialize drag movement correctly if drag.target is set after mouse move. Expand test. Honor the startDragThreshold in MouseArea drag. Don't crash if a target isn't specified for AnchorChanges. Optimization: Only allocate QScriptValue if we need too Crash: Assign context in CreateSimpleObject too Optimization: Minor object allocation speedup Optimization: Improve allocation strategy for QDeclarativeDeclarativeData
| | * Cleanup minehunt exampleYann Bodson2010-04-071-160/+114
| | | | | | | | | | | | | | | | | | | | | Make it more touchscreen friendly Use QML coding conventions Task-number: QTBUG-9361
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-065-15/+14
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Moved item wouldn't follow mouse cursor when ItemIgnoresTransformations is set Fix painting artifacts on text Prevented unnecessary copy in QImage::setAlphaChannel(). Change the ifdef for resolving function ptrs to match declaration
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-065-15/+14
| | |\ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Moved item wouldn't follow mouse cursor when ItemIgnoresTransformations is set Fix painting artifacts on text Prevented unnecessary copy in QImage::setAlphaChannel(). Change the ifdef for resolving function ptrs to match declaration
| | * | Moved item wouldn't follow mouse cursor when ItemIgnoresTransformations is setGabriel de Dietrich2010-04-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the introduction of transform properties in QGraphicsItem, QGraphicsItem::transform() is no longer enough to get the correct transform of an item. No auto-test as it involves mouse dragging. Reviewed-by: Yoann Task-number: QTBUG-9295
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-04-06318-5597/+6800
| | |\ \
| | | * | Prevented unnecessary copy in QImage::setAlphaChannel().Samuel Rødal2010-04-061-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the formats don't match the detch is unnecessary as operator= will anyways destroy the detached QImageData and substitute it with the newly created QImageData from convertToFormat. Task-number: QTBUG-9640 Reviewed-by: Trond
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-061-1/+1
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Change the ifdef for resolving function ptrs to match declaration
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-061-1/+1
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Change the ifdef for resolving function ptrs to match declaration
| | | | | * | Change the ifdef for resolving function ptrs to match declarationTom Cooksey2010-04-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: TrustMe
| | * | | | | Fix painting artifacts on textEskil Abrahamsen Blomfeldt2010-04-062-10/+7
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The height of the row is not only decided by the maximum height of the set of glyphs currently being added to the glyph cache, but also the height of the glyphs previously added to the current line in the glyph cache. To minimize the space used, we now calculate the maximum height for glyphs per line, and use this as the vertical advancement when positioning the next line in the cache. The change also removes a redundant test ((c_x + c.w > c.h) is caught earlier on and will always be false at this point.) Task-number: QTBUG-9176 Reviewed-by: Trond
generated by cgit v0.12 at 2024-11-22 15:31:17 (GMT)