summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-05-20355-4842/+7450
|\
| * Fix crash when using fonts in non-gui QApplicationEskil Abrahamsen Blomfeldt2010-05-201-2/+5
| * Deselect the current selection when the QItemSelectionModel::model is reset.Stephen Kelly2010-05-204-9/+67
| * Autotest fix on macosxThierry Bastian2010-05-201-1/+1
| * Compile with gcc 4.0.1Olivier Goffart2010-05-209-13/+13
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-205-60/+160
| |\
| | * improve Unicode Normalization autotestRitt Konstantin2010-05-201-28/+57
| | * more subtests for QCharRitt Konstantin2010-05-201-0/+19
| | * nano optimization of canonicalOrderHelper()Ritt Konstantin2010-05-201-7/+13
| | * fix canonicalOrderHelper() for some corner caseRitt Konstantin2010-05-201-4/+4
| | * use new QChar::requiresSurrogates() instead of hardcoded valueRitt Konstantin2010-05-201-5/+5
| | * prevent fake normalizationRitt Konstantin2010-05-201-2/+4
| | * prefer QChar::*surrogate() over hardcoded valuesRitt Konstantin2010-05-201-3/+3
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-192-11/+55
| | |\
| * | \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-20179-992/+3327
| |\ \ \ | | |/ / | |/| |
| | * | Be consistent in conversion from string (eg. color, int rounding).Warwick Allison2010-05-201-11/+14
| | * | Simplify code to make next change clearer.Warwick Allison2010-05-201-14/+9
| | * | Stop warnings.Warwick Allison2010-05-202-11/+11
| | * | Improve error messages when tests fail.Warwick Allison2010-05-201-14/+15
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-206-8/+178
| | |\ \
| | | * | Stop highlight animators for highlightFollowsCurrentItem: falseMartin Jones2010-05-206-8/+178
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-2021-93/+192
| | |\ \ \ | | | |/ /
| | | * | Rename Component::errorsString() -> errorString() (and also forBea Lam2010-05-2012-22/+24
| | | * | Fixes for docs, example codeBea Lam2010-05-209-71/+168
| | * | | Ensure valuetype enums can be assigned from JSAaron Kennedy2010-05-202-0/+10
| | * | | Improve testcaseAaron Kennedy2010-05-202-1/+11
| | |/ /
| | * | Make test more stableAaron Kennedy2010-05-201-2/+3
| | * | Autotest (XFAIL) for QTBUG-10822Aaron Kennedy2010-05-202-0/+22
| | * | Add return value for resolveTypeInNamespaceAaron Kennedy2010-05-202-3/+3
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-203-0/+21
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-201-0/+1
| | | |\ \
| | | * | | Fix test. Missed files.Warwick Allison2010-05-203-0/+21
| | * | | | Fix testAaron Kennedy2010-05-201-1/+0
| | | |/ / | | |/| |
| | * | | Missing breakAaron Kennedy2010-05-201-0/+1
| | |/ /
| | * | Create overview page for examples for Extending QML in C++Bea Lam2010-05-203-4/+27
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-19148-860/+2840
| | |\ \ | |/ / /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-19148-860/+2840
| | |\ \
| | | * | Search for QML import libraries also in application directoryKai Koehne2010-05-192-8/+16
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-19146-852/+2824
| | | |\ \
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-05-1927-211/+698
| | | | |\ \
| | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-195-163/+242
| | | | | |\ \
| | | | | | * | Rename qml executable to qmlviewerKai Koehne2010-05-193-6/+8
| | | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-199-162/+439
| | | | | | |\ \
| | | | | | | * | Introduce a threaded interpreter for QML binding bytecodeAaron Kennedy2010-05-191-156/+233
| | | | | | * | | Don't crash if the target parent is destroyed.Martin Jones2010-05-191-1/+1
| | | | | * | | | Disable mouse-based selection in TextInput/TextEditWarwick Allison2010-05-197-10/+137
| | | | | | |/ / | | | | | |/| |
| | | | | * | | Bug moved.Warwick Allison2010-05-191-1/+1
| | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-1979-127/+349
| | | | | |\ \ \ | | | | | | |/ /
| | | | | | * | When changing Loader source, remove old item from scene immediately.Martin Jones2010-05-191-2/+6
| | | | | | * | Fix folderlistmodel with qt namespaceMartin Jones2010-05-192-0/+14