summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-102596-40/+318839
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-106-9/+50
| |\
| | * Expect fail.Martin Jones2010-02-101-0/+4
| | * Expect fails.Martin Jones2010-02-101-0/+3
| | * Make sure item release isn't deferred indefinatelyMartin Jones2010-02-102-9/+16
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-101-0/+25
| | |\
| | | * Missing fileAaron Kennedy2010-02-101-0/+25
| | * | Expect fail.Martin Jones2010-02-101-0/+2
| | |/
| * | Attempt to clairify highlight range docsAlan Alpert2010-02-101-0/+10
| |/
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-104-1/+23
| |\
| | * TestAaron Kennedy2010-02-101-0/+17
| | * CrashAaron Kennedy2010-02-101-0/+2
| | * Fix testsBea Lam2010-02-102-1/+4
| * | Exclude plugins example in test.Martin Jones2010-02-101-0/+1
| |/
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-102-0/+5
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-107-321/+96
| | |\
| | | * Add expected fail and created QTBUG-8072 for qml animation auto-testLeonardo Sobral Cunha2010-02-101-0/+1
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-0974-1703/+2707
| | |\ \
| | * | | Reproduce bug.Warwick Allison2010-02-091-0/+4
| * | | | Compile.Martin Jones2010-02-101-1/+1
| * | | | Remove pathview test.Martin Jones2010-02-101-1/+0
| * | | | Remove unneededMartin Jones2010-02-101-8/+0
| * | | | Fix repeater test.Martin Jones2010-02-102-5/+8
| * | | | Revert "Remove unimplemented methods from header"Martin Jones2010-02-101-0/+2
| * | | | Revert "Replace QList<>* support with QmlListProperty"Martin Jones2010-02-1024-248/+350
| * | | | Revert "Compile"Martin Jones2010-02-101-2/+2
| | |_|/ | |/| |
| * | | Fix expected error message.Martin Jones2010-02-101-3/+1
| * | | Consolidate the two pathview tests and fix them all.Martin Jones2010-02-104-315/+89
| * | | A little optimization in QTextControlPrivate::setContent.Alexis Menard2010-02-091-3/+5
| | |/ | |/|
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-092596-37/+318885
| |\ \
| | * | Get test compilingAlan Alpert2010-02-091-1/+1
| | * | Remove unimplemented methods from headerKai Koehne2010-02-091-2/+0
| | * | Properly insert objects into the context's object listAlan Alpert2010-02-091-0/+1
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-0932-387/+313
| | |\ \
| | | * | CompileAaron Kennedy2010-02-091-2/+2
| | | * | Replace QList<>* support with QmlListPropertyAaron Kennedy2010-02-0924-350/+248
| | | |/
| | | * Remove old implicit module support.Warwick Allison2010-02-094-14/+29
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-091-3/+4
| | | |\
| | | | * Merge branch 'master' of git://git-nokia.trolltech.com.au/qtsoftware/qt/qt-qmlBea Lam2010-02-0822-612/+523
| | | | |\
| | | | * | Connect to localhost instead of QHostAddress::Any. Fixes test on Windows.Bea Lam2010-02-081-3/+4
| | | * | | Use networkAccessManagerFactory() for worker threads too.Martin Jones2010-02-092-14/+20
| | | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-0813-565/+274
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-085-1/+148
| | | |\ \ \
| | | * | | | For local fonts, we can just addApplicationFont() rather than loading data.Martin Jones2010-02-081-4/+10
| | * | | | | Missed a fileAlan Alpert2010-02-091-0/+23
| | | |_|/ / | | |/| | |
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-085-511/+93
| | |\ \ \ \
| | | * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-082593-35/+318808
| | | |\ \ \ \
| | | | * | | | Add getter functions to QAbstractDynamicMetaObject and QmlOpenMetaObjectTypeMarco Bubke2010-02-082-1/+23
| | | | * | | | Changed define name to reflect change in Creator.Erik Verbruggen2010-02-081-2/+2
| | | | * | | | re-enable QT_USE_FAST_CONCATENATIONErik Verbruggen2010-02-081-1/+1