Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-08 | 41 | -275/+320 |
|\ | |||||
| * | Allow objects to be shared between QmlEngines | Aaron Kennedy | 2010-02-08 | 9 | -75/+112 |
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-02-08 | 2 | -13/+13 |
| |\ | |||||
| * | | Use QUrl::fromLocalFile() instead of "file://" (i.e. only 2 slashes). | Bea Lam | 2010-02-08 | 32 | -200/+208 |
* | | | Fix test. | Martin Jones | 2010-02-08 | 1 | -6/+22 |
| |/ |/| | |||||
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-08 | 0 | -0/+0 |
|\ \ | |||||
| * \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bill King | 2010-02-08 | 1 | -6/+6 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bill King | 2010-02-08 | 1 | -2/+1 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Fixes: make qt-creator compile | Bill King | 2010-02-08 | 1 | -1/+1 |
* | | | | Fix item removal. | Martin Jones | 2010-02-08 | 1 | -7/+7 |
| |_|/ |/| | | |||||
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-08 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-02-08 | 3 | -2/+11 |
| |\ \ | |||||
| * | | | Fix private header include. | Bea Lam | 2010-02-08 | 1 | -1/+1 |
* | | | | Make atBeginning/viewArea calculations account for min extent. | Martin Jones | 2010-02-08 | 1 | -6/+6 |
| |/ / |/| | | |||||
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-08 | 13 | -84/+119 |
|\ \ \ | | |/ | |/| | |||||
| * | | Fix autotest. | Michael Brasser | 2010-02-08 | 2 | -0/+10 |
| |/ | |||||
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-05 | 2592 | -35/+318503 |
| |\ | |||||
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-05 | 2592 | -35/+318503 |
| | |\ | |||||
| * | \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-02-05 | 6 | -45/+30 |
| |\ \ \ | |||||
| | * | | | Revert "Prevent widgets with WA_DontShowOnScreen from keeping the app running" | Tor Arne Vestbø | 2010-02-05 | 2 | -41/+9 |
| | * | | | Fix for number entry in QDateTimeEntry using Shift+KeyPad (QTBUG-7842) | Thomas Sondergaard | 2010-02-05 | 2 | -1/+3 |
| | * | | | Get rid of setFirstActionActive on mouse release in QMenu | Pierre Rossi | 2010-02-05 | 2 | -3/+18 |
| | |/ / | |||||
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-02-05 | 4 | -39/+40 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | doc: Fixed some qdoc warnings. | Martin Smith | 2010-02-05 | 1 | -2/+0 |
| | * | | doc: Fixed some qdoc warnings. | Martin Smith | 2010-02-05 | 1 | -14/+16 |
| | * | | doc: Fixed some qdoc warnings. | Martin Smith | 2010-02-05 | 1 | -23/+0 |
| | * | | doc: Fixed some qdoc warnings. | Martin Smith | 2010-02-05 | 1 | -0/+24 |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-02-05 | 2 | -0/+39 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Add QMacCompatGLenum overrides for new QGLShaderProgram functions | Rhys Weatherley | 2010-02-05 | 2 | -0/+39 |
* | | | | Fix test. | Martin Jones | 2010-02-05 | 1 | -2/+1 |
| |_|/ |/| | | |||||
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-05 | 16 | -97/+141 |
|\ \ \ | |||||
| * | | | Remove hacky fix (breaks autotest). | Michael Brasser | 2010-02-05 | 1 | -1/+0 |
| * | | | Fix Behaviors for object-type properties. | Michael Brasser | 2010-02-05 | 4 | -3/+48 |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-05 | 1 | -1/+1 |
| |\ \ \ | |||||
| * | | | | Pass symbols::prefix (Action -> QmlAction) | Warwick Allison | 2010-02-05 | 11 | -93/+93 |
* | | | | | Fix test. | Martin Jones | 2010-02-05 | 2 | -9/+18 |
| |/ / / |/| | | | |||||
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-05 | 2 | -85/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fix bad merge (compile) | Warwick Allison | 2010-02-05 | 1 | -83/+0 |
| * | | | Pass tst_headers::licenseCheck | Warwick Allison | 2010-02-05 | 1 | -0/+40 |
* | | | | Add license header. | Martin Jones | 2010-02-05 | 1 | -1/+41 |
|/ / / | |||||
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-05 | 13 | -24/+24 |
|\ \ \ | |||||
| * | | | Test fixes. | Michael Brasser | 2010-02-05 | 8 | -12/+12 |
| * | | | More test fixes. | Michael Brasser | 2010-02-05 | 5 | -12/+12 |
* | | | | Fix ListView tests. | Martin Jones | 2010-02-05 | 2 | -15/+33 |
|/ / / | |||||
* | | | Clean up QmlImageReader thread on engine destruction. | Martin Jones | 2010-02-05 | 4 | -13/+22 |
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-05 | 4 | -2/+5 |
|\ \ \ | |||||
| * | | | Test fixes. | Michael Brasser | 2010-02-05 | 3 | -2/+3 |
| * | | | Add a QEXPECT_FAIL for known bug. | Michael Brasser | 2010-02-05 | 1 | -0/+2 |
* | | | | Update test to handle QmlNetworkAccessManagerFactory | Martin Jones | 2010-02-05 | 1 | -19/+22 |
|/ / / | |||||
* | | | Fix autotest. | Michael Brasser | 2010-02-05 | 1 | -49/+43 |