summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-0841-275/+320
|\
| * Allow objects to be shared between QmlEnginesAaron Kennedy2010-02-089-75/+112
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-082-13/+13
| |\
| * | Use QUrl::fromLocalFile() instead of "file://" (i.e. only 2 slashes).Bea Lam2010-02-0832-200/+208
* | | Fix test.Martin Jones2010-02-081-6/+22
| |/ |/|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-080-0/+0
|\ \
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBill King2010-02-081-6/+6
| |\ \
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBill King2010-02-081-2/+1
| |\ \ \ | | | |/ | | |/|
| * | | Fixes: make qt-creator compileBill King2010-02-081-1/+1
* | | | Fix item removal.Martin Jones2010-02-081-7/+7
| |_|/ |/| |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-081-1/+1
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-083-2/+11
| |\ \
| * | | Fix private header include.Bea Lam2010-02-081-1/+1
* | | | Make atBeginning/viewArea calculations account for min extent.Martin Jones2010-02-081-6/+6
| |/ / |/| |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-0813-84/+119
|\ \ \ | | |/ | |/|
| * | Fix autotest.Michael Brasser2010-02-082-0/+10
| |/
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-052592-35/+318503
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-052592-35/+318503
| | |\
| * | \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-056-45/+30
| |\ \ \
| | * | | Revert "Prevent widgets with WA_DontShowOnScreen from keeping the app running"Tor Arne Vestbø2010-02-052-41/+9
| | * | | Fix for number entry in QDateTimeEntry using Shift+KeyPad (QTBUG-7842)Thomas Sondergaard2010-02-052-1/+3
| | * | | Get rid of setFirstActionActive on mouse release in QMenuPierre Rossi2010-02-052-3/+18
| | |/ /
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-054-39/+40
| |\ \ \ | | |/ / | |/| |
| | * | doc: Fixed some qdoc warnings.Martin Smith2010-02-051-2/+0
| | * | doc: Fixed some qdoc warnings.Martin Smith2010-02-051-14/+16
| | * | doc: Fixed some qdoc warnings.Martin Smith2010-02-051-23/+0
| | * | doc: Fixed some qdoc warnings.Martin Smith2010-02-051-0/+24
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-052-0/+39
| |\ \ \ | | |/ / | |/| |
| | * | Add QMacCompatGLenum overrides for new QGLShaderProgram functionsRhys Weatherley2010-02-052-0/+39
* | | | Fix test.Martin Jones2010-02-051-2/+1
| |_|/ |/| |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-0516-97/+141
|\ \ \
| * | | Remove hacky fix (breaks autotest).Michael Brasser2010-02-051-1/+0
| * | | Fix Behaviors for object-type properties.Michael Brasser2010-02-054-3/+48
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-051-1/+1
| |\ \ \
| * | | | Pass symbols::prefix (Action -> QmlAction)Warwick Allison2010-02-0511-93/+93
* | | | | Fix test.Martin Jones2010-02-052-9/+18
| |/ / / |/| | |
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-052-85/+2
|\ \ \ \ | |/ / /
| * | | Fix bad merge (compile)Warwick Allison2010-02-051-83/+0
| * | | Pass tst_headers::licenseCheckWarwick Allison2010-02-051-0/+40
* | | | Add license header.Martin Jones2010-02-051-1/+41
|/ / /
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-0513-24/+24
|\ \ \
| * | | Test fixes.Michael Brasser2010-02-058-12/+12
| * | | More test fixes.Michael Brasser2010-02-055-12/+12
* | | | Fix ListView tests.Martin Jones2010-02-052-15/+33
|/ / /
* | | Clean up QmlImageReader thread on engine destruction.Martin Jones2010-02-054-13/+22
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-054-2/+5
|\ \ \
| * | | Test fixes.Michael Brasser2010-02-053-2/+3
| * | | Add a QEXPECT_FAIL for known bug.Michael Brasser2010-02-051-0/+2
* | | | Update test to handle QmlNetworkAccessManagerFactoryMartin Jones2010-02-051-19/+22
|/ / /
* | | Fix autotest.Michael Brasser2010-02-051-49/+43