Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast... | Qt Continuous Integration System | 2011-02-22 | 1 | -6/+14 |
|\ | |||||
| * | Designer: Check for 0-spacing when loading grid settings. | Friedemann Kleint | 2011-02-21 | 1 | -6/+14 |
* | | Fix compilation: Q_UNUSED takes exactly one variable that is unused | Thiago Macieira | 2011-02-21 | 1 | -1/+1 |
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-17 | 3 | -5/+14 |
|\ \ | |||||
| * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-02-14 | 1 | -2/+2 |
| |\ \ | |||||
| | * | | Rename 'plugins\qmldebugging' (work around qmake issues) | Kai Koehne | 2011-02-11 | 1 | -2/+2 |
| * | | | Designer: Slots of main container not visible in signal/slot editor. | Friedemann Kleint | 2011-02-11 | 2 | -3/+12 |
* | | | | Merge branch earth-team/master into earth-staging | João Abecasis | 2011-02-16 | 1 | -6/+27 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-master | axis | 2011-01-31 | 1233 | -1287/+1297 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | Help message clarification | Thiago Marcos P. Santos | 2011-01-14 | 1 | -1/+1 |
| * | | | | No longer copy the executable file to phone by default | Thiago Marcos P. Santos | 2011-01-14 | 1 | -5/+26 |
* | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-10 | 122 | -14413/+7753 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-02-09 | 3 | -29/+66 |
| |\ \ \ \ | |||||
| | * | | | | Fix regression in creating mkspecs/default | Miikka Heikkinen | 2011-02-09 | 3 | -29/+66 |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-02-08 | 3 | -15/+22 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix the compilation error that the previous fix didn't fix | Thiago Macieira | 2011-02-08 | 1 | -1/+1 |
| | * | | | | | Fix compilation error: symbol is namespaced. | Thiago Macieira | 2011-02-08 | 1 | -0/+2 |
| | * | | | | | Make qdbus show all types, even those that it doesn't know about | Thiago Macieira | 2011-02-06 | 1 | -2/+9 |
| | * | | | | | Designer: Fix a crash in the Signal-Slot-Editor. | Friedemann Kleint | 2011-02-04 | 2 | -13/+11 |
| | |/ / / / | |||||
| * | | | | | Ensured that trailing newlines are quoted and correct atoms are used. | David Boddie | 2011-02-05 | 2 | -5/+17 |
| * | | | | | Fixed build breakage. | David Boddie | 2011-02-04 | 1 | -1/+1 |
| * | | | | | Fixed C++ and plain markup found in \c commands. | David Boddie | 2011-02-04 | 1 | -6/+25 |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | David Boddie | 2011-02-04 | 10 | -58/+105 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| * | | | | | Added a configuration variable for the QML documentation file prefix. | David Boddie | 2011-02-03 | 10 | -175/+217 |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2011-02-02 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | Doc: Fixing typo | Sergio Ahumada | 2011-01-31 | 1 | -1/+1 |
| * | | | | | | Fixed a bug that caused marked up inline text to be truncated. | David Boddie | 2011-02-02 | 1 | -1/+1 |
| * | | | | | | Doc: Updated the copyright statements in the templates. | David Boddie | 2011-02-01 | 2 | -2/+2 |
| |/ / / / / | |||||
| * | | | | | Doc: Added a missing style sheet to the qhp manifest. | David Boddie | 2011-01-28 | 1 | -1/+1 |
| * | | | | | Doc: Fixed the qthelp namespace for the Qt documentation. | David Boddie | 2011-01-28 | 1 | -1/+1 |
| * | | | | | Merge branch 'qdoc-simplified' into 4.7 | David Boddie | 2011-01-27 | 1 | -6/+4 |
| |\ \ \ \ \ | |||||
| | * | | | | | Avoid hard-coding product names in page titles. | David Boddie | 2011-01-27 | 1 | -6/+4 |
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | David Boddie | 2011-01-26 | 4 | -7/+19 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Removed a configuration file that can no longer be used. | David Boddie | 2011-01-24 | 1 | -12/+0 |
| * | | | | | | Merge branch '4.7' into qdoc-simplified | David Boddie | 2011-01-24 | 1 | -1/+4 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Ensured that an uninitialized output codec is never used. | David Boddie | 2011-01-24 | 1 | -1/+4 |
| * | | | | | | | Merge branch '4.7' into qdoc-simplified | David Boddie | 2011-01-21 | 1192 | -1214/+1271 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Merge branch '4.7' of ../qt into 4.7 | David Boddie | 2011-01-13 | 1192 | -1213/+1264 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'qdoc-simplified' into 4.7 | David Boddie | 2010-12-21 | 10 | -25/+39 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'qdoc-simplified' into 4.7 | David Boddie | 2010-12-21 | 4 | -15/+15 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'qdoc-simplified' into 4.7 | David Boddie | 2010-12-20 | 2 | -30/+27 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2010-12-20 | 1 | -1/+7 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-12-18 | 1 | -1/+7 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Doc: Updated the qdoc manual. | David Boddie | 2011-01-21 | 1 | -12/+21 |
| * | | | | | | | | | | | | | Allowed the indentation of marked up code to be customized. | David Boddie | 2011-01-20 | 2 | -8/+17 |
| * | | | | | | | | | | | | | Enabled syntax highlighting by default. | David Boddie | 2011-01-20 | 6 | -35/+20 |
| * | | | | | | | | | | | | | Ongoing improvements and fixes to syntax highlighting. | David Boddie | 2011-01-20 | 12 | -49/+100 |
| * | | | | | | | | | | | | | Added a \js command for JavaScript code. | David Boddie | 2011-01-20 | 1 | -0/+12 |
| * | | | | | | | | | | | | | Ensured that QML elements are marked up as types. | David Boddie | 2011-01-20 | 1 | -2/+1 |
| * | | | | | | | | | | | | | Define what the -slow command line option does. | David Boddie | 2011-01-18 | 8 | -19/+16 |