Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix compile after merge from 4.6. | Michael Brasser | 2009-08-25 | 26 | -28/+29 |
| | |||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-08-25 | 23 | -187/+510 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Kai Koehne | 2009-08-25 | 2 | -0/+99 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | Reading and writing of QVariant for QmlValueType | Thomas Hartmann | 2009-08-25 | 2 | -0/+99 |
| | | | | | | | | | | | | | | | | | | This is very useful for Bauhaus and avoids code duplication Reviewed-by: Aaron Kennedy | ||||
| * | | Don't crash for QFxWebView::setUrl(QUrl) | Kai Koehne | 2009-08-25 | 1 | -1/+1 |
| |/ | |||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-08-25 | 13 | -50/+335 |
| |\ | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/qml/qmlcompiler.cpp src/declarative/qml/qmlengine_p.h | ||||
| | * | Merge branch 'kinetic-declarativeui' of ↵ | Kai Koehne | 2009-08-25 | 10 | -48/+329 |
| | |\ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-08-25 | 2 | -4/+4 |
| | | |\ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | | * | Merge branch 'kinetic-declarativeui' of ↵ | Yann Bodson | 2009-08-25 | 5 | -39/+252 |
| | | | |\ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | | * \ | Merge branch 'kinetic-declarativeui' of ↵ | Yann Bodson | 2009-08-25 | 2 | -7/+13 |
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | | * \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Yann Bodson | 2009-08-24 | 13 | -202/+220 |
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | | * \ \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Yann Bodson | 2009-08-24 | 9 | -93/+133 |
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | | * | | | | | Use 'extend' for now. 'extends' is a JavaScript reserved words | Yann Bodson | 2009-08-24 | 1 | -3/+3 |
| | | | | | | | | | |||||
| | | | * | | | | | Add missing CONSTANT to view property. | Yann Bodson | 2009-08-24 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | | * | | | | | | Add support for prefixed attached properties at compile time | Aaron Kennedy | 2009-08-25 | 3 | -9/+68 |
| | | | |_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | To reduce possible confusion, an id used within a component may not conflict with namespace prefixes. | ||||
| | | * | | | | | Implement QFxKeyNavigationAttached class | Aaron Kennedy | 2009-08-25 | 3 | -39/+142 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation is missing until we fix up focus behaviour | ||||
| | | * | | | | | Remove the QmlBinding_Id from QmlContext on destruction | Aaron Kennedy | 2009-08-25 | 2 | -2/+15 |
| | | | | | | | | |||||
| | | * | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-08-25 | 5 | -153/+22 |
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | | * | | | | Remove unnecessary KeysAttached static map | Martin Jones | 2009-08-25 | 2 | -7/+13 |
| | | | | |_|/ | | | | |/| | | |||||
| | | * | | | | Add (non-functional) KeyNavigation type | Aaron Kennedy | 2009-08-25 | 1 | -1/+98 |
| | | | | | | | |||||
| | * | | | | | Silence gcc compiler error | Kai Koehne | 2009-08-24 | 1 | -2/+5 |
| | | | | | | | |||||
| * | | | | | | Make QmlEnginePrivate::Imports a stack type. | Warwick Allison | 2009-08-25 | 2 | -5/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes memleak. | ||||
| * | | | | | | Revert cb81a637c8ef041cff2e96c6065763084776d75a | Warwick Allison | 2009-08-25 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Programming error to call with ns==0. | ||||
| * | | | | | | Largely revert 40c12237b506bd and implement simpler more efficient way. | Warwick Allison | 2009-08-24 | 5 | -135/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Still doubtful that ACTUAL version import is needed. | ||||
| * | | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-08-24 | 13 | -201/+216 |
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | | | Centralize QNetworkRequest attribute setting, turn on pipelining. | Warwick Allison | 2009-08-24 | 6 | -6/+0 |
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... in two places. Qt expects the "application" to configure caching, proxy, pipelining, etc., on a QNetworkAccessManager, so now we do that in the two most important cases: the loader example and qmlviewer tool. | ||||
* | | | | | | Only need to mess with the scope chain when evaluating. | Michael Brasser | 2009-08-25 | 1 | -6/+6 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-08-24 | 8 | -166/+167 |
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | Remove QmlDomDocument::save | Kai Koehne | 2009-08-24 | 2 | -13/+1 |
| | | | | | |||||
| * | | | | Remove QmlDomDocument::version | Kai Koehne | 2009-08-24 | 2 | -12/+1 |
| | | | | | | | | | | | | | | | | | | | | Has been superseeded by the versioning/library infrastructure. | ||||
| * | | | | Remove setter from QmlDom classes | Kai Koehne | 2009-08-24 | 2 | -119/+2 |
| | |/ / | |/| | | | | | | | | | | | | | | | | | | All methods modifying the object dom were removed. Change was discussed with Aaron. | ||||
| * | | | Disallow lowercase import qualifier ids | Aaron Kennedy | 2009-08-24 | 1 | -1/+10 |
| | | | | |||||
| * | | | Fix crash on missing imports. | Aaron Kennedy | 2009-08-24 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | This would previously crash: Blah.Rectangle {} | ||||
| * | | | Expose type library information in QmlDomObject | Kai Koehne | 2009-08-24 | 8 | -21/+150 |
| | | | | | | | | | | | | | | | | | | | | New QmlDomObject::objectTypeMajorVersion && objectTypeMinorVersion accessors expose import library information. | ||||
* | | | | Fix list startPosition calculation. | Martin Jones | 2009-08-24 | 1 | -2/+5 |
|/ / / | |||||
* | | | Add a spacing property to ListView | Martin Jones | 2009-08-24 | 2 | -14/+41 |
| | | | |||||
* | | | Fix onFooPressed key handlers. | Martin Jones | 2009-08-24 | 2 | -21/+7 |
| | | | |||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-08-24 | 9 | -90/+130 |
|\ \ \ | |/ / | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-08-24 | 1 | -2/+0 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * \ | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-08-24 | 3 | -9/+26 |
| | |\ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | Remove duplicated signals. | Michael Brasser | 2009-08-24 | 1 | -2/+0 |
| | | |/ | | |/| | |||||
| * | | | Rename positioners. | Warwick Allison | 2009-08-24 | 6 | -82/+85 |
| | | | | | | | | | | | | | | | | QFxBasePositioner still exists though. | ||||
| * | | | Special handling of Tab/BackTab | Warwick Allison | 2009-08-24 | 2 | -0/+22 |
| | |/ | |/| | | | | | | | | | | This may need to be reconsidered with QML focus improvements, but for now, we simply ensure the webview behaves like a QWebView. | ||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-08-24 | 2 | -7/+5 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Fix WebViewSettings | Warwick Allison | 2009-08-24 | 2 | -6/+23 |
| | | | | | | | | | | | | | | | | | | | | More QML <-> JavaScript integration, with example. From Tapani Mikola | ||||
* | | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-08-24 | 1 | -3/+3 |
|\ \ \ \ | | |/ / | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-08-24 | 41 | -447/+729 |
| |\ \ \ | | | |/ | | |/| | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Doc tweak. | Martin Jones | 2009-08-24 | 1 | -3/+3 |
| | | | | |||||
* | | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-08-24 | 10 | -42/+78 |
|\ \ \ \ | | |/ / | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Rhys Weatherley | 2009-08-24 | 3 | -10/+10 |
| |\ \ \ | | | |/ | | |/| | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui |