summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3
Commit message (Collapse)AuthorAgeFilesLines
* Increase qdoc3 stack size when using MSVC to 4M.Casper van Donderen2011-11-141-0/+5
| | | | | | | | | | | When running 'make docs' on Win7 with MSVC2010 64bit debug qdoc will crash from a stack overflow. The stack overflow occurs when sorting the list of nodes in the internal qdoc tree. This patch circumvents the stack overflow crash by increasing the stack size from the standard 1M to 4M. Reviewed-by: Friedemann Kleint
* qdoc3: Replace %REPLACEME% with the correct pathMartin Smith2011-10-312-2/+7
| | | | Task-number: QTBUG-22427
* Fix security issue on website due to bad JS.Casper van Donderen2011-10-214-47/+1
| | | | Reviewed-by: Trust Me
* Merge remote branch 'origin/4.8' into 4.8-from-4.7Rohan McGovern2011-09-1460-444/+728
|\ | | | | | | | | | | Conflicts: src/gui/text/qtextengine_p.h src/network/ssl/qsslsocket_openssl.cpp
| * Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Liang Qi2011-09-032-38/+0
| |\ | | | | | | | | | | | | Conflicts: tools/qdoc3/htmlgenerator.cpp
| | * Modified \since command behavior slightly to handle project and version.David Boddie2011-09-029-202/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (The since argument can contain a project name and version, defaulting to the qdoc project if only a version number is specified.) Refactored common code into the Generator class. Fixed \sincelist HTML generation for tables containing only one item. (cherry picked from commit 6a2f18140bbc41207eb2f5e2323b699600d89606) Reapplied after bad v4.7.4 merge
| | * Added an additional check to workaround an issue on Windows.David Boddie2011-09-021-1/+1
| | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie Original-patch-by: Friedemann Kleint (cherry picked from commit 8b1654ec6a892e84c1654c9196e80461ee6e92fa)
| * | Merge branch 4.8 into qt-4.8-from-4.7Sergio Ahumada2011-09-0110-38/+327
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: tools/qdoc3/ditaxmlgenerator.cpp tools/qdoc3/htmlgenerator.cpp
| | * Merge remote branch 'mainline/4.8'Casper van Donderen2011-08-312-59/+8
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/cppcodemarker.cpp tools/qdoc3/node.cpp
| | * \ Merge remote branch 'qt-doc-review/master'Casper van Donderen2011-08-3111-172/+169
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/righttoleft.qdoc tools/qdoc3/generator.h
| | | * \ Merge branch '4.8'Casper van Donderen2011-08-3011-48/+303
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/righttoleft.qdoc
| | | | * | qdoc3: Updates to qdoc to print error message in ALL CAPSMartin Smith2011-08-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when the path argument for an \example command refers to a directory that does not exist. Task-number: QTBUG-21165
| | * | | | Merge remote branch 'qt-doc-team/4.8'Casper van Donderen2011-08-2910-44/+333
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/righttoleft.qdoc tools/qdoc3/ditaxmlgenerator.cpp tools/qdoc3/generator.h tools/qdoc3/htmlgenerator.cpp
| | | * | | qdoc3: Updates for QTBUG-20776; include fileToOpen path.Martin Smith2011-08-181-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-20776
| | | * | | qdoc3: Updates for QTBUG-20776; clear map between runs.Martin Smith2011-08-181-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-20776
| | | * | | qdoc3: Updates for QTBUG-20739 (no read-only for QML components)Martin Smith2011-08-114-2/+40
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-20739
| | | * | | qdoc3: Updates for QTBUG-20776 and QTBUG-20777Martin Smith2011-08-103-18/+86
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-20776, QTBUG-20777
| | | * | | qdoc: Check pointer for null before dereferencing.Martin Smith2011-08-031-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-20725
| | | * | | qdoc3: Reverting part of the change for QTBUG-17072Martin Smith2011-08-021-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17072
| | | * | | qdoc3: Write "Signal Handlers" instead of "Signals" as headerMartin Smith2011-08-023-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17072
| | | * | | qdoc: Fixed to remove extranious markup tags.Martin Smith2011-07-221-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Task-numberr: QTBUG-20474
| | | * | | qdoc: Added HTML.nobreadcrumbs as a config variable.Martin Smith2011-07-212-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | Task-numberr: QTBUG-20475
| | | * | | Phase 1 of QTBUG-20412, the XML manifest fileMartin Smith2011-07-1510-23/+140
| | | | | |
| * | | | | Merge remote-tracking branch 'upstream/4.8' into qt-4.8-from-4.7Sergio Ahumada2011-08-3129-92/+54
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | Conflicts: src/network/ssl/qsslcertificate.cpp
| | * | | | Merge remote-tracking branch 'upstream/4.8'Sergio Ahumada2011-08-2910-186/+208
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | Conflicts: tools/qdoc3/cppcodemarker.cpp
| | | * | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-08-2710-186/+208
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Fixed use of deleted object in XmlPatterns EvaluationCache Crash when creating scroll bar skin graphics on S60 (debug only) QS60Style omits drawing theme background in some Symbian SDKs Fix for qml1shaderplugin GPU resource handling on Symbian Make it easier to select words at the start of a line. Doc: Fixing typo In landscape mode QComboboBox popup can not be showed completely Fix left alignment of native RTL pre-edit text.
| | * | \ \ \ Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-08-2629-47/+67
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-08-253-6/+13
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (21 commits) Revert "Avoid calling QInputMethod update when adding or removing QGraphicsItems that don't have focus" Symbian: Not possible to catch RequestSoftwareInputPanel in eventFilter Fix problem with grabWindow on Mac OS X 10.6 with Cocoa Added an additional check to workaround an issue on Windows. don't crash when destroying children Fix compile issue with Mac OS X 10.5 Avoid calling QInputMethod update when adding or removing QGraphicsItems that don't have focus Exact word bubble doesn't disappear when screen is tapped (fix part 2) Fix QPixmap::grabWindow() on Mac OS X Lion Update 4.7.4 changes Exact word bubble doesn't disappear when screen is tapped Make text rendering working outside the gui thread on Symbian. Doc: Clarified the range of return values from QLineF::angle(). Doc: Fixed \since declarations. Doc: Standardized on QtQuick for \since declarations. Doc: Removed whitespace. Modified \since command behavior slightly to handle project and version. Doc: Added a simple introduction to Qt and fixed links. Doc: Added more appropriate links to help reduce confusion. Doc: Removed non-ASCII characters from the documentation. ...
| | | * | | | Doc: Fixed qdoc warnings.David Boddie2011-08-152-2/+3
| | | | | | |
| | | * | | | Improved comment finding code.David Boddie2011-08-112-24/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid snippet markers and prevent accidental reuse of comments for different objects.
| | | * | | | Added language information to the pure documentation parser.David Boddie2011-08-112-0/+6
| | | | | | |
| | | * | | | qdoc: Fixed a crash caused by accessing a null pointer.David Boddie2011-07-221-2/+3
| | | | | | |
| | | * | | | Doc: Added a copy of the online style images for the qdoc manual.David Boddie2011-07-2019-0/+0
| | | | | | |
| | | * | | | Doc: Removed the Google Analytics script.David Boddie2011-07-191-13/+1
| | | | | | |
| | * | | | | fix warningKonstantin Ritt2011-08-221-1/+1
| | | | | | |
| | * | | | | remove unused functionsOswald Buddenhagen2011-08-222-51/+0
| | |/ / / /
| * | | | | Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-3110-208/+186
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | Conflicts: doc/src/index.qdoc
| * | | | | Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-2610-186/+208
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/index.qdoc src/xmlpatterns/expr/qevaluationcache_p.h
| * | | | | Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-233-6/+13
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | Conflicts: doc/src/index.qdoc
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵v4.7.4Qt Continuous Integration System2011-08-231-1/+2
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix problem with grabWindow on Mac OS X 10.6 with Cocoa don't crash when destroying children Fix compile issue with Mac OS X 10.5 Fix QPixmap::grabWindow() on Mac OS X Lion Update 4.7.4 changes
| | * | | | Added an additional check to workaround an issue on Windows.David Boddie2011-08-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie Original-patch-by: Friedemann Kleint (cherry picked from commit 8b1654ec6a892e84c1654c9196e80461ee6e92fa)
| | * | | | Modified \since command behavior slightly to handle project and version.David Boddie2011-06-309-202/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (The since argument can contain a project name and version, defaulting to the qdoc project if only a version number is specified.) Refactored common code into the Generator class. Fixed \sincelist HTML generation for tables containing only one item.
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-06-092-5/+11
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-05-161-1/+1
| | | |\ \ \ \
| | | * | | | | qdoc: Fixed QTBUG-19338Martin Smith2011-05-162-5/+11
| | | | | | | |
| * | | | | | | Modified \since command behavior slightly to handle project and version.David Boddie2011-07-019-202/+174
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (The since argument can contain a project name and version, defaulting to the qdoc project if only a version number is specified.) Refactored common code into the Generator class. Fixed \sincelist HTML generation for tables containing only one item. (cherry picked from commit 6a2f18140bbc41207eb2f5e2323b699600d89606)
| * | | | | | qdoc: Fixed code to match comments in QML files. Fixed API types.David Boddie2011-06-082-7/+6
| | | | | | |
| * | | | | | Added an additional check to workaround an issue on Windows.David Boddie2011-06-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie Original-patch-by: Friedemann Kleint
| * | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-05-2482-1540/+1569
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qrawfont.cpp src/gui/text/qtextlayout.cpp src/gui/util/qscroller.cpp src/gui/widgets/qlineedit.cpp
| | * \ \ \ \ \ Merge remote branch 'origin/4.7' into 4.8-from-4.7Rohan McGovern2011-05-1782-1540/+1569
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/network/access/qnetworkaccessdatabackend.cpp src/xmlpatterns/expr/qevaluationcache_p.h tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp tools/assistant/tools/assistant/helpviewer_qwv.h tools/qtconfig/mainwindowbase.cpp tools/qtconfig/paletteeditoradvancedbase.cpp tools/qtconfig/paletteeditoradvancedbase.ui tools/qtconfig/previewwidgetbase.ui
generated by cgit v0.12 at 2024-12-29 06:22:27 (GMT)