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-2411-92/+175
|\
| * Fix abort in flipableLeonardo Sobral Cunha2010-03-241-1/+1
| | | | | | | | | | | | | | | | | | Flipable was calling updateSceneTransformFromParent, but this can only called when the the parent's scene transform is guaranteed to be updated, which is not the case in flipable. Task-number: QTBUG-8474 Reviewed-by: bnilsen
| * Add object ids to the metadata provided in debugger classes.Bea Lam2010-03-248-8/+52
| |
| * Properly use one thread for all instances of XmlListModel.Bea Lam2010-03-242-83/+122
| | | | | | | | Task-number: QT-2831
* | Remove support for QML-in-HTML-in-WebViewWarwick Allison2010-03-242-88/+0
| | | | | | | | Currently, this feature too prone to accidental misuse and abuse.
* | Revert 95aa8c8fc76e2309a629b05994a2677b0887140b.Warwick Allison2010-03-246-55/+0
|/
* Make compile.Michael Brasser2010-03-241-1/+1
|
* Output all Loader errors.Michael Brasser2010-03-241-0/+2
| | | | | Previously we were not outputting those that occurred on component->create().
* Fix Loader leak when loading a non-QGraphicsObject object.Michael Brasser2010-03-241-1/+5
|
* Use setParent_NoEvent in Loader and benchmark Loader performance.Michael Brasser2010-03-241-2/+3
|
* Animation construction optimization.Michael Brasser2010-03-241-1/+1
| | | | Use setParent_NoEvent when parenting to group.
* Origin safety testing for imported resources.Warwick Allison2010-03-245-13/+48
| | | | | Extends upon 95aa8c8fc76e2309a629b05994a2677b0887140b. Still under discussion.
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Warwick Allison2010-03-2312-53/+67
|\ | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-234-7/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed usage of xplatform in configure. Fixed mif generation on symbian-abld. Fixed regular expression matching. More fool proof way for finding these headers Merge symbianutils from qtcreator e82219b344ee471dbb5d8e7f1351404ff9616d6c Enable installation of a sis file without running any application Replace download % display with a progress bar This file does not exist Fix configure false positives when checking for symbian Fix compile on symbian better. Make ICON generation (to symbian mif) work for relative paths/shadow builds Disable OpenVG for symbian-sbsv2 on Linux. Corrected wrong header casing. Moved -s60 and -usedeffiles options docs to Symbian section. Added rpp and rsg files to ignore filter. Forced little endianness when using symbian-sbsv2 mkspec. Fixed incorrect platform string when building for Symbian. Added -qt-style-s60 to Symbian configure options on Linux.
| | * Merge branch 'linux-symbian-sbsv2-support' into 4.7-s60axis2010-03-231-1/+1
| | |\
| | | * Corrected wrong header casing.axis2010-03-151-1/+1
| | | |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-233-6/+5
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Merge symbianutils from qtcreator e82219b344ee471dbb5d8e7f1351404ff9616d6c Enable installation of a sis file without running any application Replace download % display with a progress bar This file does not exist Fix configure false positives when checking for symbian Fix compile on symbian better. Make ICON generation (to symbian mif) work for relative paths/shadow builds
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-233-6/+5
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Merge symbianutils from qtcreator e82219b344ee471dbb5d8e7f1351404ff9616d6c Enable installation of a sis file without running any application Replace download % display with a progress bar This file does not exist Fix configure false positives when checking for symbian Fix compile on symbian better. Make ICON generation (to symbian mif) work for relative paths/shadow builds
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-223-6/+5
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Merge symbianutils from qtcreator e82219b344ee471dbb5d8e7f1351404ff9616d6c Enable installation of a sis file without running any application Replace download % display with a progress bar This file does not exist Fix configure false positives when checking for symbian Fix compile on symbian better. Make ICON generation (to symbian mif) work for relative paths/shadow builds
| | | | | * | This file does not existThomas Zander2010-03-221-2/+1
| | | | | | |
| | | | | * | Fix compile on symbian better.Thomas Zander2010-03-222-4/+4
| | | | | | |
| * | | | | | Wrong repaint when changing the default row height in QTreeViewGabriel de Dietrich2010-03-231-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When in QTreeView::dataChanged(), we didn't check for the actual change in the value before setting QTreeViewPrivate::defaultItemHeight. Hence, if uniformRowHeights is true, we completely miss any resizing of the items. Reviewed-by: Thierry Task-number: QTBUG-9216
| * | | | | | Optimize QMetaObject::indexOf* functionsOlivier Goffart2010-03-231-31/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Comparing the first character before calling strcmp gives big speedup, as it avoid the overhead of calling the strcmp function in many cases. In indexOfMethodRelative, fix the normalize case. The computation of the normalized string was put outside of the for loop, but it should have been inside. This was not detected by the test because the wrong string is at the end. In IndexOfMethodRelative, we do not need to check if the method is a signal or a slot, because we only iterate over the right interval. This is only true for code generated by moc since Qt 4.6. Which means that in application compiled with Qt 4.5 and older, indexOfSignal could now return a slot with the same name (and vice-versa), but I this it is safe to ignore that "problem". Reviewed-by: Roberto Raggi Reviewed-by: Kent Hansen
| * | | | | | Add new function QTextLine::horizontalAdvance()Eskil Abrahamsen Blomfeldt2010-03-233-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a function to QTextLine which returns the accumulated advance of the glyphs in the text. Previously QTextLine::naturalTextWidth() was used for both this purpose and for calculating the pixel width of the text. Since these two metrics are not the same, either of the two usages would be wrong. QTextLine::naturalTextWidth() has been changed to do what its documentation claims it does, and horizontalAdvance() should now be used for laying out text horizontally. Reviewed-by: Simon Hausmann
| * | | | | | Fix warning on Sequential Animation GroupThierry Bastian2010-03-231-6/+1
| | | | | | |
| * | | | | | build fix for mingwThierry Bastian2010-03-231-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we need to define WIN32_LEAN_AND_MEAN to include both windows.h and winsock2.h (http://msdn.microsoft.com/en-us/library/ms737629(VS.85).aspx)
| * | | | | | Fix QGraphicsEffect cache when the item is not visible by the view.Alexis Menard2010-03-232-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't rely on the exposed rect since the item can be outside the view so we need to regenerate the complete pixmap. Task-number:QTBUG-8750 Reviewed-by:sroedal
| * | | | | | Calling setX and setY should send itemSendGeometry/ScenePositionChanged eventsAlexis Menard2010-03-231-3/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SetX and setY were calling setPosHelper directly therefore events for itemSendGeometryChange and itemSendScenePositionChange were not sent properly. Task-number:QTBUG-9093 Reviewed-by:janarve
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Warwick Allison2010-03-232-21/+14
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir
| * | | | | API fixes to QGLBuffer.Rhys Weatherley2010-03-222-21/+14
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use GLuint for bufferId(), not uint. Replace the raw bind() function with a raw release(), because that's the only useful case for being able to do a raw glBindBuffer(). Reviewed-by: Daniel Pope
* | | | | Fix warning.Michael Brasser2010-03-231-1/+1
| | | | |
* | | | | Changing the alignment property should trigger a repaint.Alexis Menard2010-03-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just clear the cache when the property changes. Task-number:QTBUG-8155 Reviewed-by:Yann Bodson
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-239-272/+58
|\ \ \ \ \
| * | | | | Change default RotationAnimation direction.Michael Brasser2010-03-232-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shortest as default too often led to unintuitive behavior. For example, RotationAnimation { from: 0; to: 360 } will not animate at all. Numerical gives the least surprising results.
| * | | | | Add missing NOTIFYs.Michael Brasser2010-03-234-7/+41
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8816
| * | | | | Remove ParentAction.Michael Brasser2010-03-236-256/+7
| | | | | | | | | | | | | | | | | | | | | | | | It has been replaced with ParentAnimation.
| * | | | | Fix mutex handling that was causing tests to sometimes crash/fail.Bea Lam2010-03-231-2/+2
| | | | | |
* | | | | | Basic Loader origin safety (for discussion).Warwick Allison2010-03-233-0/+21
|/ / / / /
* | | | | Manual merge.Warwick Allison2010-03-227-9/+81
| | | | |
* | | | | Test imports with realistic paths (previously passed accidentally).Warwick Allison2010-03-221-3/+10
| | | | | | | | | | | | | | | | | | | | Fix failure when import path is ancestor dir of other import path.
* | | | | Add Script removal to QmlChanges.txtMartin Jones2010-03-221-0/+38
| | | | |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-2251-673/+489
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (26 commits) Use canonical form for headers Remove exporting of QDeclarativeContext class symbols Remove non-existing header from pri file Fix Loader crash. Compile in namespace Deprecate inline Script {} blocks Update metaobjectbuilder version test. Set role names for QFileSystemModel and QDirModel Removed wrong parenthesis around property NOTIFY declaration Remove dead performance measurement code from QML Fix warning mentioned in the comments of QTBUG-9182. Fix test. Ensure positioner animations are triggered correctly Fix qdeclarativeqt::createQmlObject autotest Add MiddleButton = MidButton to MouseButtons enum. Fix qdeclarativetextedit::delegateLoading autotest Fix Behavior documentation due to easing changes. Fix crash when calling createObject on a component with errors. Initialize variable. Produce an error when trying to create objects in a PropertyChanges. ...
| * | | | Use canonical form for headersKai Koehne2010-03-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows QmlDesigner to use qdeclarativestate_p_p.h Reviewed-by: Marco Bubke
| * | | | Remove exporting of QDeclarativeContext class symbolsKai Koehne2010-03-221-1/+1
| | | | | | | | | | | | | | | | | | | | We're not using it in QmlDesigner any more
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-2250-670/+486
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (24 commits) Remove non-existing header from pri file Fix Loader crash. Compile in namespace Deprecate inline Script {} blocks Update metaobjectbuilder version test. Set role names for QFileSystemModel and QDirModel Removed wrong parenthesis around property NOTIFY declaration Remove dead performance measurement code from QML Fix warning mentioned in the comments of QTBUG-9182. Fix test. Ensure positioner animations are triggered correctly Fix qdeclarativeqt::createQmlObject autotest Add MiddleButton = MidButton to MouseButtons enum. Fix qdeclarativetextedit::delegateLoading autotest Fix Behavior documentation due to easing changes. Fix crash when calling createObject on a component with errors. Initialize variable. Produce an error when trying to create objects in a PropertyChanges. Fix Flipable crash. Reduce amount of qmldir parsing ...
| | * | | Remove non-existing header from pri fileKai Koehne2010-03-221-2/+1
| | | | | | | | | | | | | | | | | | | | Got added in 081fafe395d52.
| | * | | Fix Loader crash.Michael Brasser2010-03-221-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If setting the source of a Loader triggered a change to the source (i.e. the thing being loaded set the source to something else) a crash would occur. We now no longer delete the component immediately when the source changes. Task-number: QTBUG-9241
| | * | | Compile in namespaceAaron Kennedy2010-03-221-1/+1
| | | | |
| | * | | Deprecate inline Script {} blocksAaron Kennedy2010-03-2218-23/+349
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inline blocks/includes have been replaced with an import syntax: import "foo.js" as Foo this gives better separation between QML and code. Imported script blocks also have a mandatory qualifier, which leads to better optimization potential.
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-2224-562/+5
| | |\ \ \
generated by cgit v0.12 at 2024-11-15 01:03:42 (GMT)