Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Thiago Macieira | 2010-05-02 | 10 | -57/+154 |
|\ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-04-30 | 8 | -13/+67 |
| |\ | |||||
| | * | doc: Fixed some qdoc errors. | Martin Smith | 2010-04-30 | 1 | -0/+1 |
| | * | qdoc: Added breadcrumbs for namespaces. | Martin Smith | 2010-04-30 | 2 | -3/+7 |
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | Martin Smith | 2010-04-30 | 2 | -3/+3 |
| | |\ | |||||
| | | * | Backport a fix to Designer filterwidget | Jens Bache-Wiig | 2010-04-29 | 2 | -3/+3 |
| | * | | qdoc: Added "All namespaces" to the API Lookup box. | Martin Smith | 2010-04-30 | 1 | -0/+1 |
| | |/ | |||||
| | * | qdoc: Added breadcrumbs to examples. Coolio. | Martin Smith | 2010-04-29 | 3 | -0/+37 |
| | * | qdoc: Sprinkled more breadcrumbs. | Martin Smith | 2010-04-28 | 2 | -9/+20 |
| * | | Don't disable the symbian media backend. | Andrew den Exter | 2010-04-29 | 1 | -16/+20 |
| |/ | |||||
| * | Fix compile. | Aaron McCarthy | 2010-04-28 | 1 | -1/+1 |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-04-27 | 4 | -29/+68 |
| |\ | |||||
| | * | qdoc: Added breadcrumbs for class pages. | Martin Smith | 2010-04-27 | 2 | -27/+19 |
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | Martin Smith | 2010-04-27 | 9 | -49/+50 |
| | |\ | |||||
| | * | | qdoc: Removed MacRefs for Xcode documentation stuff. | Martin Smith | 2010-04-27 | 3 | -3/+50 |
* | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2010-04-28 | 36 | -438/+960 |
|\ \ \ \ | |||||
| * \ \ \ | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Thiago Macieira | 2010-04-27 | 36 | -438/+960 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-04-27 | 4 | -16/+25 |
| | |\ \ \ | | | |_|/ | | |/| | | |||||
| | | * | | Fix remaining 4.6 type registrations (to 4.7). | Warwick Allison | 2010-04-27 | 1 | -1/+1 |
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-04-26 | 4 | -15/+24 |
| | | |\ \ | |||||
| | | | * | | Unify naming of settings / UI to be "Qt Qml Runtime" | Kai Koehne | 2010-04-26 | 3 | -6/+7 |
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-04-24 | 3 | -9/+17 |
| | | | |\ \ | |||||
| | | | | * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-04-24 | 3 | -9/+17 |
| | | | | |\ \ | | | | | | |/ | | | | | |/| | |||||
| | | | | | * | Fix hidden menu on embedded. | Warwick Allison | 2010-04-23 | 2 | -7/+17 |
| | | | | | * | Location of binary is not on installed-content import path. | Warwick Allison | 2010-04-23 | 1 | -2/+0 |
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-04-26 | 4 | -29/+12 |
| | |\ \ \ \ \ | |||||
| | | * \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | David Boddie | 2010-04-26 | 18 | -134/+387 |
| | | |\ \ \ \ \ | |||||
| | | | * | | | | | Improved workaround for new qt documentation, base on dboddie's work. | kh1 | 2010-04-26 | 3 | -13/+12 |
| | | | |/ / / / | |||||
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | David Boddie | 2010-04-23 | 1 | -13/+30 |
| | | |\ \ \ \ \ | |||||
| | | * | | | | | | Ensure that all qthelp URLs have paths that start with /qdoc/. | David Boddie | 2010-04-23 | 2 | -6/+5 |
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | David Boddie | 2010-04-22 | 1 | -40/+39 |
| | | |\ \ \ \ \ \ | |||||
| | | * | | | | | | | Doc: Fixed the Declarative documentation set. Tweaked the others. | David Boddie | 2010-04-22 | 5 | -26/+44 |
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-04-26 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | |||||
| | | * | | | | | | | Assigned a UID3 to qml.exe. | Frans Englich | 2010-04-26 | 1 | -1/+1 |
| | | | |_|_|_|/ / | | | |/| | | | | | |||||
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-04-26 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | |||||
| | | * | | | | | | Doc: correcting a character bug in the footer. | Morten Engvoldsen | 2010-04-26 | 1 | -1/+1 |
| | | |/ / / / / | |||||
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-04-24 | 3 | -18/+36 |
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-04-23 | 3 | -18/+36 |
| | | |\ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | |||||
| | | | * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int... | Justin McPherson | 2010-04-23 | 3 | -3/+9 |
| | | | |\ \ \ \ | |||||
| | | | | * | | | | Add support for MSBuild, which is the project format for MSVC 2010 | Martin Petersson | 2010-04-21 | 3 | -3/+9 |
| | | | * | | | | | Merge branch '4.7' of ../../qt/4.7 into 4.7 | Justin McPherson | 2010-04-22 | 22 | -272/+530 |
| | | | |\ \ \ \ \ | | | | | |/ / / / | | | | |/| | / / | | | | | | |/ / | | | | | |/| | | |||||
| | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-04-19 | 1 | -15/+27 |
| | | | |\ \ \ \ | |||||
| | | | | * \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-04-18 | 1 | -15/+27 |
| | | | | |\ \ \ \ | |||||
| | | | | | * \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-04-16 | 1 | -15/+27 |
| | | | | | |\ \ \ \ | |||||
| | | | | | | * | | | | QtMediaservices -> QtMediaServices. | Justin McPherson | 2010-04-16 | 1 | -5/+5 |
| | | | | | | * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int... | Justin McPherson | 2010-04-15 | 6 | -21/+62 |
| | | | | | | |\ \ \ \ | |||||
| | | | | | | * | | | | | Create Mediaservices lib, separate from Multimedia. | Justin McPherson | 2010-04-15 | 1 | -15/+27 |
| | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-04-23 | 1 | -13/+30 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | / | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | | | |||||
| | | * | | | | | | | | qdoc: Removed nested <ul> elements from the TOC | Martin Smith | 2010-04-23 | 1 | -13/+30 |
| | | | |_|_|_|_|/ / | | | |/| | | | | | | |||||
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-04-22 | 11 | -106/+341 |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | |