Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Merge branch '4.7' of /home/dboddie/git/oslo-staging-1 into 4.7 | David Boddie | 2010-06-25 | 10 | -122/+428 | |
| |\ \ | ||||||
| | * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | David Boddie | 2010-06-23 | 4 | -20/+164 | |
| | |\ \ | ||||||
| | * | | | Doc: Fixed whitespace issues and added missing files to lists. | David Boddie | 2010-06-23 | 3 | -67/+90 | |
| | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me | |||||
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/dboddies-oslo-staging-1-qdoc ↵ | David Boddie | 2010-06-18 | 4 | -16/+254 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | into 4.7 | |||||
| * | | | | | qdoc: Added a workaround for QML/Qt class name clashes. | David Boddie | 2010-06-18 | 6 | -10/+41 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me | |||||
* | | | | | | doc: Added more DITA output to the XML generator | Martin Smith | 2010-06-28 | 2 | -16/+97 | |
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | Added cxxDefine for macros. Task-number: QTBUG-11391 | |||||
* | | | | | doc: Added more DITA output to the XML generator | Martin Smith | 2010-06-28 | 1 | -0/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added cxxVariableStorageClassSpecifierStatic. Task-number: QTBUG-11391 | |||||
* | | | | | Fixed copy-paste error in htmlgenerator.cpp | Rohan McGovern | 2010-06-26 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: htmlgenerator.cpp:1893: error: stray ‘\’ in program | |||||
* | | | | | Doc: fixing search bug | Morten Engvoldsen | 2010-06-25 | 2 | -3/+15 | |
| | | | | | ||||||
* | | | | | doc: Added more DITA output to the XML generator | Martin Smith | 2010-06-25 | 2 | -8/+66 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Output the \variable stuff as a cxxVariable. Task-number: QTBUG-11391 | |||||
* | | | | | doc: Added more DITA output to the XML generator | Martin Smith | 2010-06-25 | 5 | -76/+207 | |
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | Output Q_PROPERTY as a cxxVariable. Task-number: QTBUG-11391 | |||||
* | | | | doc: Added more DITA output to the XML generator | Martin Smith | 2010-06-22 | 3 | -8/+71 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Some of the cxxVariable stuff for properties. Task-number: QTBUG-11391 | |||||
* | | | | doc: Added more DITA output to the XML generator | Martin Smith | 2010-06-22 | 1 | -1/+45 | |
| | | | | | | | | | | | | | | | | | | | | | | | | The cxxTypedef stuff for typedefs. Task-number: QTBUG-11391 | |||||
* | | | | Finish merge conflict. | Martin Smith | 2010-06-22 | 5 | -34/+19 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 Conflicts: tools/qdoc3/ditaxmlgenerator.cpp | |||||
| * | | | | qdoc3: Build fix for regression in f321a3f2b1e | Andreas Kling | 2010-06-22 | 2 | -4/+4 | |
| | | | | | ||||||
| * | | | | qdoc3: Build fix for regression in e2f0e728e | Andreas Kling | 2010-06-22 | 3 | -6/+5 | |
| | |_|/ | |/| | | ||||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | David Boddie | 2010-06-21 | 7 | -41/+152 | |
| |\ \ \ | ||||||
| * | | | | Doc: Relicensed the documentation under the GNU FDL version 1.3. | David Boddie | 2010-06-21 | 1 | -25/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me Requested-by: Legal | |||||
* | | | | | doc: Added more DITA output to the XML generator | Martin Smith | 2010-06-22 | 1 | -3/+41 | |
| |/ / / |/| | | | | | | | | | | | | | | | | | | | The rest of the cxxEnumeration stuff for enum types. Task-number: QTBUG-11391 | |||||
* | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | Martin Smith | 2010-06-21 | 3 | -18/+18 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | Morten Engvoldsen | 2010-06-21 | 4 | -18/+60 | |
| |\ \ \ \ | ||||||
| * | | | | | Doc: Fixing bugs to style and script | Morten Engvoldsen | 2010-06-21 | 3 | -18/+18 | |
| | |/ / / | |/| | | | ||||||
* | | | | | doc: Added more DITA output to the XML generator | Martin Smith | 2010-06-21 | 2 | -5/+74 | |
| |/ / / |/| | | | | | | | | | | | | | | | | | | | cxxEnumeration stuff for enum types. Task-number: QTBUG-11391 | |||||
* | | | | doc: Added more DITA output to the XML generator | Martin Smith | 2010-06-21 | 4 | -18/+60 | |
|/ / / | | | | | | | | | | | | | | | | | | | More cxxFunction stuff for member functions. Function parameters and other stuff. Task-number: QTBUG-11391 | |||||
* | | | doc: Added more DITA output to the XML generator | Martin Smith | 2010-06-18 | 3 | -5/+47 | |
| |/ |/| | | | | | | | | | More cxxFunction stuff for member functions. Task-number: QTBUG-11391 | |||||
* | | doc: Added more DITA output to the XML generator | Martin Smith | 2010-06-17 | 2 | -11/+105 | |
| | | | | | | | | | | | | More cxxFunction stuff for member functions. Task-number: QTBUG-11391 | |||||
* | | doc: Added more DITA output to the XML generator | Martin Smith | 2010-06-16 | 4 | -16/+160 | |
|/ | | | | | | Some of the cxxFunction stuff for member functions. Task-number: QTBUG-11391 | |||||
* | doc: Added more DITA output to the XML generator | Martin Smith | 2010-06-15 | 4 | -446/+178 | |
| | | | | Task-number: QTBUG-11391 | |||||
* | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | Martin Smith | 2010-06-11 | 31 | -107/+665 | |
|\ | ||||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵ | Qt Continuous Integration System | 2010-06-09 | 8 | -48/+495 | |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (34 commits) Attempt to fix build failure on Linux introduced by 09c6a81109 minor cosmetic improvements designer: add sorting in signal-slot editor window deprecate header files in $$QT_BUILD_TREE/include/Qt syncqt: change tabs to spaces I10n: Update German translations for 4.7.0 Fix a freetype link failure. Fix configure test for DirectFB Split Symbian bearer plugin into three platform specfic plugins Doc: Fixed whitespace in the other configuration file for zh_CN. Doc: Fixed whitespace in the Simplified Chinese doc configuration. Unbreak Linux build when qendian.h is included before qglobal.h Revert accidental commit of irrelevant stuff. Silly mondays.. Unbreak Linux build when qendian.h is included before qglobal.h Fix QApplication/QWidget to really take ownership of input contexts Added setting a hotspot on standard gestures Fixed GestureOverride event delivery in GraphicsView. add check-ts target to auto-asses translation completeness qt_ja_JP.ts => qt_ja.ts Fix incorrect \since tag ... | |||||
| | * | Doc: Fixed whitespace in the other configuration file for zh_CN. | David Boddie | 2010-06-07 | 1 | -22/+22 | |
| | | | | | | | | | | | | Reviewed-by: Trust Me | |||||
| | * | Doc: Fixed whitespace in the Simplified Chinese doc configuration. | David Boddie | 2010-06-07 | 1 | -26/+26 | |
| | | | | | | | | | | | | Reviewed-by: Trust Me | |||||
| | * | * Add Japanese tutorial documents | Takumi ASAKI | 2010-06-07 | 8 | -0/+447 | |
| | | | | | | | | | | | | * Add Japanese hellotr example | |||||
| * | | Fixed qdoc3 crash. | Rohan McGovern | 2010-06-09 | 1 | -3/+3 | |
| |/ | | | | | | | Fixes "Invalid read of size 4" reported by valgrind. | |||||
| * | Doc: updating images | Morten Engvoldsen | 2010-06-02 | 14 | -0/+0 | |
| | | ||||||
| * | Doc: adding offline docs to assistant and Qt Creator. Improving small docs ↵ | Morten Engvoldsen | 2010-06-02 | 11 | -57/+168 | |
| | | | | | | | | and adding highlighting | |||||
* | | doc: Added DITA XML generator | Martin Smith | 2010-06-11 | 5 | -749/+772 | |
|/ | | | | Task-number: QTBUG-11391 | |||||
* | doc: Added DITA XML generator | Martin Smith | 2010-06-01 | 2 | -0/+5131 | |
| | ||||||
* | qdoc: Added DITA XML generator | Martin Smith | 2010-05-31 | 3 | -3/+116 | |
| | | | | | At the moment, it is just like the HTML generator, but with a different class name. | |||||
* | doc: Changed last breadcrumb to not be a link. | Martin Smith | 2010-05-31 | 1 | -33/+16 | |
| | | | | Task-number: QTBUG-10577 | |||||
* | qdoc: Fixed the model/view programming page; tried a style change. | Martin Smith | 2010-05-28 | 2 | -12/+3 | |
| | ||||||
* | Doc: Fixing bugs in HTML generator | Morten Engvoldsen | 2010-05-25 | 1 | -4/+4 | |
| | ||||||
* | qdoc: Improved class index page. | Martin Smith | 2010-05-25 | 1 | -104/+89 | |
| | | | | The classes.html page will look good with the correct css. | |||||
* | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | Morten Engvoldsen | 2010-05-21 | 1 | -2/+2 | |
|\ | ||||||
| * | qdoc: Fixed html error, but the problem is still there. | Martin Smith | 2010-05-21 | 1 | -1/+1 | |
| | | ||||||
| * | qdoc: Changed number of columns to 1. Oila! | Martin Smith | 2010-05-21 | 1 | -1/+1 | |
| | | ||||||
* | | Doc: design changes | Morten Engvoldsen | 2010-05-21 | 1 | -7/+0 | |
|/ | | | | Fixing menus and js | |||||
* | Doc: Changes to the HTMLGenerator, style and js | Morten Engvoldsen | 2010-05-21 | 12 | -11/+20 | |
| | | | | | | Replacing tables with lists in the HTML generator Adding img to search box Moving JS from template to script files | |||||
* | use qtPrepareTool for qdoc | Oswald Buddenhagen | 2010-05-20 | 1 | -14/+1 | |
| | | | | Reviewed-by: joerg | |||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | David Boddie | 2010-05-20 | 3 | -10/+8 | |
|\ |