summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-08-256-7/+117
|\
| * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-08-2578-516/+1054
| |\
| | * Fix compilation (missing include)Kai Koehne2009-08-251-0/+1
| | * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Kai Koehne2009-08-254-0/+109
| | |\
| | | * Reading and writing of QVariant for QmlValueTypeThomas Hartmann2009-08-252-0/+99
| | | * QVector3D: missing implicit conversion to QVariantThomas Hartmann2009-08-252-0/+10
| | * | Don't crash for QFxWebView::setUrl(QUrl)Kai Koehne2009-08-251-1/+1
| | |/
| * | Only need to mess with the scope chain when evaluating.Michael Brasser2009-08-251-6/+6
* | | Avoid shadowing QWebPage::view().Warwick Allison2009-08-252-4/+4
| |/ |/|
* | Update.Warwick Allison2009-08-252-1/+1
* | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-08-2558-375/+741
|\ \
| * \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Kai Koehne2009-08-2555-373/+735
| |\ \
| | * \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Yann Bodson2009-08-252-5/+5
| | |\ \
| | | * | Remove excessive margins in SameGameAlan Alpert2009-08-251-3/+3
| | | * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-08-252-31/+62
| | | |\ \
| | | * | | Dialog width is dependent on textAaron Kennedy2009-08-251-2/+2
| | * | | | Fix the size of the buttonYann Bodson2009-08-252-3/+2
| | | |/ / | | |/| |
| | * | | SameGame small cosmetic changesYann Bodson2009-08-252-31/+62
| | |/ /
| | * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Yann Bodson2009-08-257-10/+78
| | |\ \
| | | * \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-08-2539-295/+317
| | | |\ \
| | | * | | Fixup testAaron Kennedy2009-08-251-1/+1
| | | * | | Add support for prefixed attached properties at compile timeAaron Kennedy2009-08-256-9/+77
| | * | | | Forgot to commit RssModel.qmlYann Bodson2009-08-251-0/+20
| | | |/ / | | |/| |
| | * | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Yann Bodson2009-08-255-39/+252
| | |\ \ \ | | | |/ /
| | | * | Implement QFxKeyNavigationAttached classAaron Kennedy2009-08-253-39/+142
| | | * | Remove the QmlBinding_Id from QmlContext on destructionAaron Kennedy2009-08-252-2/+15
| | | * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-08-255-153/+22
| | | |\ \
| | | * | | Add (non-functional) KeyNavigation typeAaron Kennedy2009-08-251-1/+98
| | * | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Yann Bodson2009-08-252-7/+13
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Remove unnecessary KeysAttached static mapMartin Jones2009-08-252-7/+13
| | | | |/ | | | |/|
| | * | | Mobile version of Flickr demo in flickr-mobile.qml.Yann Bodson2009-08-2537-291/+313
| | * | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Yann Bodson2009-08-2419-213/+234
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-08-2414-177/+181
| | | |\ \
| | | * | | Fix list startPosition calculation.Martin Jones2009-08-241-2/+5
| | * | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Yann Bodson2009-08-2449-149/+344
| | |\ \ \ \
| | * | | | | Use 'extend' for now. 'extends' is a JavaScript reserved wordsYann Bodson2009-08-241-3/+3
| | * | | | | Add missing CONSTANT to view property.Yann Bodson2009-08-241-1/+1
| * | | | | | Silence gcc compiler errorKai Koehne2009-08-241-2/+5
| | |_|_|/ / | |/| | | |
* | | | | | Make QmlEnginePrivate::Imports a stack type.Warwick Allison2009-08-252-5/+48
* | | | | | Revert cb81a637c8ef041cff2e96c6065763084776d75aWarwick Allison2009-08-251-3/+0
* | | | | | typoWarwick Allison2009-08-251-1/+1
* | | | | | Missed files.Warwick Allison2009-08-252-0/+86
* | | | | | Largely revert 40c12237b506bd and implement simpler more efficient way.Warwick Allison2009-08-245-135/+43
* | | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-08-2419-212/+230
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Remove QmlDomDocument::saveKai Koehne2009-08-242-13/+1
| * | | | | Remove QmlDomDocument::versionKai Koehne2009-08-242-12/+1
| * | | | | Remove setter from QmlDom classesKai Koehne2009-08-242-119/+2
| | |_|_|/ | |/| | |
| * | | | Disallow lowercase import qualifier idsAaron Kennedy2009-08-241-1/+10
| * | | | Fix crash on missing imports.Aaron Kennedy2009-08-241-0/+3
| * | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-08-249-21/+152
| |\ \ \ \