Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-04-22 | 2 | -20/+28 | |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (135 commits) Do not treat images in qml examples differently. Replace Flickable overshoot property with boundsBehavior Autotests and doc Give error on attempt to import types from too-early version number. Remove (undocumented) QML bindings for effects. De-straighten them lines. Doc: fix QStringList model doc (really). Doc: fix QStringList model docs Change return type to match value(). Add duration and easing properties to AnchorAnimation. Autotest Remove dead code Compile on Windows (export decl fix). Fix versioning of Qt Declarative's in-built types Fixed declarative/parserstress autotest. Fix parsing of regular expression literals. Fill out QGraphicsLayout bindings Update test files to new syntax Compile without Qt3 support. Ensure workerscript.qml works (autotested). ... | |||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-04-22 | 2 | -20/+28 | |
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (135 commits) Do not treat images in qml examples differently. Replace Flickable overshoot property with boundsBehavior Autotests and doc Give error on attempt to import types from too-early version number. Remove (undocumented) QML bindings for effects. De-straighten them lines. Doc: fix QStringList model doc (really). Doc: fix QStringList model docs Change return type to match value(). Add duration and easing properties to AnchorAnimation. Autotest Remove dead code Compile on Windows (export decl fix). Fix versioning of Qt Declarative's in-built types Fixed declarative/parserstress autotest. Fix parsing of regular expression literals. Fill out QGraphicsLayout bindings Update test files to new syntax Compile without Qt3 support. Ensure workerscript.qml works (autotested). ... | |||||
| | * | Do not treat images in qml examples differently. | Yann Bodson | 2010-04-22 | 1 | -23/+7 | |
| | | | ||||||
| | * | Modify qdoc to handle qml examples files. | Yann Bodson | 2010-04-20 | 1 | -23/+45 | |
| | | | | | | | | | | | | Reviewed-by: Michael Brasser | |||||
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Alan Alpert | 2010-04-19 | 14 | -81/+1461 | |
| | |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/template/style/style.css tools/qdoc3/htmlgenerator.cpp | |||||
| | * | | Doc: Put "default" property label on same line as property name | Martin Jones | 2010-04-16 | 1 | -10/+3 | |
| | | | | | | | | | | | | | | | | Task-number: QTBUG-6336 | |||||
* | | | | qdoc: Updated the extra images variable again, for each manual.qdocconf. | Martin Smith | 2010-04-22 | 5 | -10/+43 | |
|/ / / | | | | | | | | | | And this time I also did it for qdeclarative.qdocconf | |||||
* | | | qdoc: Updated the extra images variable for each manual.qdocconf. | Martin Smith | 2010-04-21 | 4 | -4/+160 | |
| | | | ||||||
* | | | Doc: Cleaning HTML generator and updating index.qdoc | Morten Engvoldsen | 2010-04-20 | 2 | -73/+68 | |
| | | | | | | | | | | | | | | | | | | Adding links to the index page and removing HTML attributes like align and valing form the HTML generator Reviewed-by: Martin Smith | |||||
* | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | Martin Smith | 2010-04-20 | 4 | -28/+53 | |
|\ \ \ | ||||||
| * | | | Doc: Correcting qdocconf files for assistant | Morten Engvoldsen | 2010-04-20 | 4 | -28/+53 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Linking correct files to the qdocconf files Reviewed-by: Daniel Molkentin | |||||
* | | | | qdoc: Avoided putting bad chars in links | Martin Smith | 2010-04-20 | 2 | -7/+10 | |
|/ / / | ||||||
* | | | qdoc: Added online flag to the qdocconf file. | Martin Smith | 2010-04-19 | 4 | -141/+157 | |
| |/ |/| | | | | | | | | | | | To generate the offline docs, do nothing. To generate the online docs, add this to your qdocconf file: "online = true" | |||||
* | | qdoc: Output TOC for more class ref pages. | Martin Smith | 2010-04-16 | 1 | -10/+6 | |
| | | ||||||
* | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | Martin Smith | 2010-04-16 | 5 | -27/+30 | |
|\ \ | ||||||
| * | | qdoc: Added the index and fixed images in the extra files list. | David Boddie | 2010-04-15 | 5 | -27/+30 | |
| | | | | | | | | | | | | Reviewed-by: Trust Me | |||||
* | | | qdoc: Improved TOC for class ref pages. | Martin Smith | 2010-04-16 | 2 | -10/+39 | |
|/ / | ||||||
* | | qdoc: Fixed .qdocconf files for assistant. | Martin Smith | 2010-04-15 | 4 | -4/+113 | |
| | | ||||||
* | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | Martin Smith | 2010-04-14 | 2 | -2/+2 | |
|\ \ | ||||||
| * | | Revert "Doc: Updating design files." | Morten Engvoldsen | 2010-04-14 | 2 | -2/+2 | |
| | | | | | | | | | | | | This reverts commit d88dade723d5ddd86eea70ee4bf636c06b9f3962. | |||||
* | | | qdoc: Removed all <table> attributes in favor of using css. | Martin Smith | 2010-04-14 | 1 | -40/+25 | |
|/ / | ||||||
* | | qdoc: Checked for empty title. | Martin Smith | 2010-04-14 | 1 | -2/+4 | |
| | | ||||||
* | | qdoc: Added TOC to class ref pages. | Martin Smith | 2010-04-14 | 1 | -0/+1 | |
| | | | | | | | | | | | | It isn't a full TOC yet. It only includes h1, h2, etc from the Detaled Description part. In many classes, there aren't any of these, so many classes won't have a TOC yet. | |||||
* | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | Martin Smith | 2010-04-13 | 8 | -15/+1248 | |
|\ \ | ||||||
| * | | Doc: Updating design files. | Morten Engvoldsen | 2010-04-13 | 2 | -2/+2 | |
| | | | | | | | | | | | | Reviewed-by: trustme | |||||
| * | | Doc: Fixing design bugs. Updating the index page and script/style files. ↵ | Morten Engvoldsen | 2010-04-13 | 8 | -13/+1246 | |
| | | | | | | | | | | | | | | | | | | Adding some image files. Reveiwed-by: trustme | |||||
* | | | qdoc: Added TOC to module pages. | Martin Smith | 2010-04-13 | 1 | -15/+19 | |
|/ / | ||||||
* | | qdoc: Changed <ul> elements in TOC. | Martin Smith | 2010-04-13 | 1 | -2/+11 | |
|/ | | | | Each <ul> is now <ul class="leveli">, where i is 1..n. | |||||
* | qdoc: Fixed some TOC links. | Martin Smith | 2010-04-13 | 1 | -1/+0 | |
| | ||||||
* | qdoc: Added new table of contents for non-class ref pages | Martin Smith | 2010-04-13 | 3 | -3/+76 | |
| | | | | This feature is not complete in this commit. | |||||
* | qdoc: Changed qdoc to output the new doc format. | Martin Smith | 2010-04-09 | 19 | -45/+351 | |
| | | | | Very cool. | |||||
* | qdoc: Added many png, js, and css files for new format. | Martin Smith | 2010-04-07 | 36 | -1433/+2 | |
| | | | | | | Coming soon! Task: QTBUG-9504 | |||||
* | qdoc: Added many png, js, and css files for new format. | Martin Smith | 2010-04-07 | 37 | -0/+1438 | |
| | | | | | | Coming soon! Task: QTBUG-9504 | |||||
* | qdoc: Added <div> elements to some html output for Fake nodes. | Martin Smith | 2010-04-06 | 1 | -4/+8 | |
| | | | | Task: QTBUG-9504 | |||||
* | Merge remote branch 'origin/4.7' into 4.7 | Olivier Goffart | 2010-04-01 | 6 | -43/+87 | |
|\ | | | | | | | | | Conflicts: src/gui/text/qstatictext.cpp | |||||
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | Martin Smith | 2010-03-30 | 1 | -1/+1 | |
| |\ | ||||||
| | * | Fix compilation with Sun CC: | Thiago Macieira | 2010-03-29 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | "node.cpp", line 1337: Error: There is extra text on this line. Reviewed-by: Trust Me | |||||
| * | | qdoc: Added <div> elements to some html output for class references. | Martin Smith | 2010-03-30 | 5 | -42/+86 | |
| |/ | | | | | | | Task: QTBUG-9504 | |||||
* | | Doc: Updated the qdoc manual with i18n info. Fixed a code example. | David Boddie | 2010-03-30 | 2 | -18/+90 | |
| | | | | | | | | Reviewed-by: Trust Me | |||||
* | | Fix bad merge | Olivier Goffart | 2010-03-25 | 1 | -15/+7 | |
| | | ||||||
* | | Merge remote branch 'origin/4.7' into 4.7 | Olivier Goffart | 2010-03-25 | 6 | -36/+147 | |
|\ \ | |/ | | | | | | | | | Conflicts: tools/qdoc3/generator.cpp tools/qdoc3/node.cpp | |||||
| * | Possible fix for missing QML properties in the qt.qhp file. | Martin Smith | 2010-03-23 | 4 | -23/+126 | |
| | | | | | | | | | | | | Also adds more QML stuff to qt.index. Task: QTBUG-7724 | |||||
| * | qdoc3: Fixed some ifdef typos and removed some whitespace. | Martin Smith | 2010-03-17 | 2 | -10/+10 | |
| | | ||||||
* | | Fix warnings and build on mingw | Thierry Bastian | 2010-03-25 | 2 | -5/+5 | |
|/ | ||||||
* | qdoc: ifdefed out all the debug code. | Martin Smith | 2010-03-15 | 9 | -9/+17 | |
| | | | | | I think the crash that occurs when running qdoc over multiple qdocconf files is fixed. | |||||
* | Compile | Kent Hansen | 2010-03-11 | 1 | -1/+1 | |
| | ||||||
* | qdoc: Added debug code. | Martin Smith | 2010-03-11 | 6 | -0/+7 | |
| | ||||||
* | qdoc: Fixed lookup of QML property nodes. | Martin Smith | 2010-03-11 | 3 | -2/+23 | |
| | | | | | At this point, no QML qdoc errors appear in the output. There is still a lot of debug output. | |||||
* | qdoc: Clear a static multimap after each qdocconf file. | Martin Smith | 2010-03-08 | 3 | -0/+11 | |
| | | | | Task: QTBUG-8804 | |||||
* | qdoc: Added some debug output to track down a crash | Martin Smith | 2010-03-08 | 1 | -2/+2 | |
| | | | | The crash doesn't happen on my OS X 10.4. |