summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-10-2816-47/+216
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-10-2810-83/+164
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Yann Bodson2009-10-286-26/+100
| | |\ | | | | | | | | | | | | into kinetic-declarativeui
| | | * Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-10-286-64/+140
| | | |\ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | DocMichael Brasser2009-10-281-1/+1
| | | | |
| | * | | make TextElideMode an enum of QFxText.Yann Bodson2009-10-283-18/+23
| | | | |
| * | | | Do not display transient binding errorsAaron Kennedy2009-10-287-10/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During QML startup, it is common to have "errors" in bindings as the apps state stabilizes. These are not real errors, but just a consequence of implementing a declarative UI in an imperative world. Now during startup, the display of errors is delayed until the startup completes, and then only bindings that are still in an error state are displayed. QT-2373
| * | | | Add a QmlExpression::error() methodAaron Kennedy2009-10-288-21/+107
| | |/ / | |/| | | | | | | | | | | | | | QmlExpression should not print errors itself. This is the responsibility of the caller.
* | | | Fix dynamic exampleAlan Alpert2009-10-281-1/+15
| |_|/ |/| | | | | | | | | | | Includes adding a comment to the positioners to alert others that you shouldn't use anchors as well.
* | | Fix bug where repeater would add spacing for 0 sized childrenAlan Alpert2009-10-281-2/+4
| | |
* | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-10-282-39/+41
|\ \ \ | | |/ | |/| | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | QT-2382Yann Bodson2009-10-282-39/+41
| |/
* | Mode improvement to strictly enforced highlight range movement.Martin Jones2009-10-282-17/+89
| |
* | Ensure that the Follows handle the target value changing unexpectedly.Martin Jones2009-10-282-6/+6
|/ | | | | | If the target's property was changed elsewhere while the Follow wasn't running, it would fail to start when a source identical to its current source valule was set.
* DocAaron Kennedy2009-10-271-2/+10
|
* Support return values in synthesized methodsAaron Kennedy2009-10-272-2/+5
|
* Oops.Martin Jones2009-10-271-2/+1
|
* Try to be a bit more clever with snapping.Martin Jones2009-10-274-7/+97
|
* Add QFxVisualItemModel::children notify signalAaron Kennedy2009-10-272-1/+10
|
* Simplify the defaultObjects handlingAaron Kennedy2009-10-275-32/+9
| | | | | As the scope object is no longer added to the defaultObjects list it makes sense that the root object remain constant at position 0
* Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-10-271-6/+21
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Fix dragging at the end of a flickable with overShoot: falseMartin Jones2009-10-271-6/+21
| |
* | Don't crash when requesting an attached object for non-QML objectAaron Kennedy2009-10-271-0/+2
|/
* Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-10-271-1/+1
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Error when a QVariant property is used as a grouped propertyAaron Kennedy2009-10-271-1/+1
| | | | | | | | This crashed as the metatype of QVariant is -1.
* | Improve highlight range API and fix incorrect list end calc.Martin Jones2009-10-272-28/+37
|/
* Fixed namespace macro.Erik Verbruggen2009-10-261-2/+2
|
* Resize loader after parameters have changedAaron Kennedy2009-10-261-0/+2
|
* Compile on windowsAaron Kennedy2009-10-261-0/+6
|
* Compile with -no-qt3supportAaron Kennedy2009-10-262-3/+1
|
* Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Martin Jones2009-10-2661-494/+1483
|\ | | | | | | into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-10-2644-196/+734
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Fix more warnings.Michael Brasser2009-10-2612-17/+25
| | |
| | * Don't need this check.Michael Brasser2009-10-261-2/+1
| | |
| | * Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-10-2614-86/+526
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/qml/qbitfield_p.h
| | | * Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-10-265-13/+16
| | | |\ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | Silence warnings.Michael Brasser2009-10-265-6/+13
| | | | |
| | | * | Add support for value interceptors to the DOM.Michael Brasser2009-10-262-0/+116
| | | | |
| | | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-10-269-82/+399
| | | |\ \ | | | | | | | | | | | | | | | | | | kinetic-declarativeui
| | | | * | Suppress warnings in QtOpenGL codeRhys Weatherley2009-10-263-1/+5
| | | | | |
| | | | * | Suppress warnings under OpenGL/ES 2.0 in QGLShaderProgramRhys Weatherley2009-10-261-0/+55
| | | | | |
| | | | * | Fix OpenGL/ES 2.0 bug in previous QGLShaderProgram check-inRhys Weatherley2009-10-261-1/+1
| | | | | |
| | | | * | Use QObjectPrivate within QGLShaderPrivate and QGLShaderProgramPrivateRhys Weatherley2009-10-262-47/+134
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Sarah Smith
| | | | * | Optimize concatenation of partial shadersRhys Weatherley2009-10-262-30/+95
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Sarah Smith
| | | | * | Fix ifdef around QMatrix4x4::rotate(QQuaternion)Rhys Weatherley2009-10-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | | * | Optimize QGraphicsRotation's use of QMatrix4x4Rhys Weatherley2009-10-263-5/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous code was creating a full 3D rotation matrix and then projecting back to 2D. This change combines the two steps into one to avoid calculating matrix components that will be dropped. Reviewed-by: Sarah Smith
| | | | * | Make compile on X11 systems where qreal == floatRhys Weatherley2009-10-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Sarah Smith
| | * | | | Fix "initial" size for remote content.Warwick Allison2009-10-262-1/+12
| | | | | |
| | * | | | qmldir not needed if types are qualified.Warwick Allison2009-10-261-2/+2
| | | | | |
| | * | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-10-2622-44/+286
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui