Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-02-15 | 18 | -17/+45 |
|\ | |||||
| * | Make tst_xmlhttprequest more reliable | Aaron Kennedy | 2010-02-15 | 10 | -5/+15 |
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-15 | 4 | -10/+15 |
| |\ | |||||
| | * | Make tst_qmlecmascript::dynamicDestruction stable | Aaron Kennedy | 2010-02-15 | 1 | -5/+4 |
| | * | Make tst_qmlmetatype stable | Aaron Kennedy | 2010-02-15 | 1 | -3/+6 |
| | * | Make tests compile without webkit | Aaron Kennedy | 2010-02-15 | 2 | -2/+5 |
| * | | Update as test running qmakery changes. | Warwick Allison | 2010-02-15 | 1 | -1/+7 |
| |/ | |||||
| * | Fix compile with -no-webkit | Warwick Allison | 2010-02-15 | 3 | -1/+8 |
* | | For qmldebug* tests, make sure engine is running before the test thread | Bea Lam | 2010-02-15 | 6 | -36/+88 |
|/ | |||||
* | Fix build | Warwick Allison | 2010-02-15 | 3 | -6/+0 |
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-15 | 425 | -7030/+3720 |
|\ | |||||
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-15 | 41 | -522/+719 |
| |\ | |||||
| * \ | Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2010-02-13 | 383 | -4201/+2598 |
| |\ \ | |||||
| | * \ | Merge remote branch 'origin/master' into qt-master-from-4.6 | Thiago Macieira | 2010-02-13 | 2676 | -3479/+321418 |
| | |\ \ | | |/ / | |/| | | |||||
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast... | Qt Continuous Integration System | 2010-02-13 | 42 | -2829/+1122 |
| |\ \ \ | |||||
| | * | | | Refactor font and zoom handling, reduces clutter in central widget. | kh1 | 2010-02-12 | 10 | -167/+212 |
| | * | | | Some more refactoring. | kh1 | 2010-02-12 | 12 | -358/+462 |
| | * | | | Move the QWebView based help viewer into it's own source files. | kh1 | 2010-02-12 | 9 | -434/+560 |
| | * | | | add QMAKE_DEL_TREE (aka. rm -rf) to avoid more hard-coded platform ifdefs | Oswald Buddenhagen | 2010-02-12 | 2 | -5/+3 |
| | * | | | use variables from the spec instead of hard-coding platform ifdefs | Oswald Buddenhagen | 2010-02-12 | 1 | -7/+4 |
| | * | | | move $(DEL_FILE) 2> NUL redirection into .conf file | Oswald Buddenhagen | 2010-02-12 | 2 | -15/+3 |
| | * | | | fix host platform conditional | Oswald Buddenhagen | 2010-02-12 | 1 | -1/+1 |
| | * | | | purge msvc.net and msvc2002 makespecs. unsupported for a while now. | Oswald Buddenhagen | 2010-02-12 | 4 | -359/+0 |
| | * | | | purge msvc6 suppport from qmake. qt doesn't support it for quite a while now. | Oswald Buddenhagen | 2010-02-12 | 13 | -1585/+7 |
| | * | | | remove weird -tp ce matching line nobody can say anything about | Oswald Buddenhagen | 2010-02-12 | 1 | -1/+1 |
| | * | | | remove remainder of mac9 mode | Oswald Buddenhagen | 2010-02-12 | 5 | -24/+6 |
| | * | | | remove the most blatant tmake compat paths | Oswald Buddenhagen | 2010-02-12 | 3 | -12/+2 |
| | * | | | simplify | Oswald Buddenhagen | 2010-02-12 | 1 | -1/+1 |
| | * | | | add qt5 todo | Oswald Buddenhagen | 2010-02-12 | 1 | -1/+1 |
| | | * | | Merge remote branch 'origin/4.6' into qt-master-from-4.6 | Thiago Macieira | 2010-02-13 | 23 | -78/+114 |
| | | |\ \ | |||||
| | | | * \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr... | Qt Continuous Integration System | 2010-02-12 | 7 | -54/+94 |
| | | | |\ \ | |||||
| | | | | * | | Add make stub_sis target, and add webkit stub to qt.iby | Shane Kearns | 2010-02-12 | 4 | -43/+86 |
| | | | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr... | Qt Continuous Integration System | 2010-02-12 | 3 | -11/+8 |
| | | | | |\ \ | | | | |/ / / | |||||
| | | | | * | | Fix to S60 softkeys when no active Qt window or native widget is shown. | Janne Anttila | 2010-02-12 | 3 | -11/+8 |
| | | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-02-12 | 16 | -24/+20 |
| | | | |\ \ \ | |||||
| | | | | * \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6 | Martin Smith | 2010-02-12 | 4 | -4/+0 |
| | | | | |\ \ \ | |||||
| | | | | | * | | | Doc: remove \preliminary tag from public multimedia classes | Volker Hilsheimer | 2010-02-12 | 4 | -4/+0 |
| | | | | |/ / / | | | | |/| | | | |||||
| | | | | * | | | doc: Fixed several typos. | Martin Smith | 2010-02-12 | 12 | -20/+20 |
| | | | |/ / / | |||||
| | | * | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6 | Thiago Macieira | 2010-02-12 | 365 | -4133/+2491 |
| | | |\ \ \ \ | | | | |/ / / | |||||
| | | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-02-11 | 2 | -13/+11 |
| | | | |\ \ \ | |||||
| | | | | * | | | Revert WebCore.pro part of 2761e6f57ecd00c3435dbb8a6cf5f40653195d5d to build ... | Simon Hausmann | 2010-02-11 | 1 | -3/+1 |
| | | | | * | | | QNAM HTTP: Optimize detectPipeliningSupport() | Markus Goetz | 2010-02-11 | 1 | -7/+7 |
| | | | | * | | | QNAM HTTP: Set channel to IdleState at better place | Markus Goetz | 2010-02-11 | 1 | -3/+3 |
| | | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int... | Qt Continuous Integration System | 2010-02-11 | 2 | -5/+0 |
| | | | |\ \ \ \ | | | | | |_|/ / | | | | |/| | | | |||||
| | | | | * | | | We need to export qBadAlloc() on all platforms | Harald Fernengel | 2010-02-11 | 2 | -5/+0 |
| | | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr... | Qt Continuous Integration System | 2010-02-11 | 1 | -2/+4 |
| | | | |\ \ \ \ | | | | | |_|/ / | | | | |/| | | | |||||
| | | | | * | | | Fixed the perl download link and description in docs | Miikka Heikkinen | 2010-02-11 | 1 | -2/+4 |
| | | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-02-11 | 1 | -1/+1 |
| | | | |\ \ \ \ | | | | | |_|/ / | | | | |/| | | | |||||
| | | | | * | | | QXmlSchema: fix crash in schema parser | Peter Hartmann | 2010-02-11 | 1 | -1/+1 |
| | | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int... | Qt Continuous Integration System | 2010-02-11 | 3 | -9/+2 |
| | | | |\ \ \ \ | | | | | |_|/ / | | | | |/| | | |