summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3
Commit message (Collapse)AuthorAgeFilesLines
* Updated URLs.Robert Loehning2010-03-041-1/+1
| | | | Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
* doc: Fixed some qdoc errors.Martin Smith2010-03-041-1/+3
| | | | | | | The QtMultimedia module needed to have its own \page unique name so that the QtMultimedia \module would not conflict with the QtMultimedia \namespace.
* qdoc3: Trying to find a bug that causes a crash.Martin Smith2010-03-032-8/+7
| | | | | | | | It doesn't crash on OS X, but it does on some other platforms. If you run into this crash running qdoc3, you can work around it by commenting out line 1539 in tools/qdoc3/htmlgenerator.cpp The line to comment out is: generateQmlInheritedBy(qml_cn, marker);
* Compile.Morten Johan Sørvig2010-03-021-0/+1
|
* Merge remote branch 'berlin/4.7' into 4.7Oswald Buddenhagen2010-03-0215-21/+53
|\
| * Introduce optional qdoc_bootstrapped qmake flagHarald Fernengel2010-03-0115-21/+53
| | | | | | | | | | | | | | This allows building documentation even when cross-compiling. Note that for official documentation, you should always use your host's qdoc3 binary. This qmake option is for testing whether you introduced new qdoc warnings even if you don't have a native build around.
* | qdoc: Second attempt, QML doc stuff.Martin Smith2010-03-027-36/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | This change caused a crash on several platforms before, but not on mine, of course. It outputs a list of new QML elements on the What's New in 4.7 page, and it outputs the "Inherited by" list on each QML elemnent page for elements that are inherited by other elements. I can't see why it should crash anything, but I have included some debug output. I think the crash might have something to do with QList<T>, which qdoc3 uses heavily. If it crashes for you, please get a stack trace and the debug output.
* | doc: Fixed building documentationThorbjørn Lindeijer2010-03-011-0/+0
| | | | | | | | qml.qdocconf wasn't renamed yet.
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-2610-73/+124
|\ \ | |/
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-259-72/+123
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (35 commits) Doc: Added a config file for creating Simplified Chinese docs directly. Doc: add a few lines about bearer managment to "What's New" page. Fix the SIMD implementations of QString::toLatin1() Update of the QScriptValue autotest suite. New data set for QScriptValue autotest generator. Autotest: make tst_qchar run out-of-source too Autotest: add a test for roundtrips through toLatin1/fromLatin1 Implement toLatin1_helper with Neon QRegExp::pos() should return -1 for empty/non-matching captures Revert "qdoc: Finished "Inherited by" list for QML elements." Revert "qdoc: List new QML elements in \sincelist for What's New page." Add the Unicode normalisation properties. Autotest: add a test for QDBusPendingCallWatcher use in threads Doc: placeholders for new feature highlights. doc: mark as reimplemented. Update of the QScriptValue autotest suite. New autotests cases for QScriptValue autotests generator. QScriptValue autotest generator templates change. Fix license template. QScriptValue::isQMetaObject crash fix. ...
| | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1David Boddie2010-02-257-71/+36
| | |\
| | | * Revert "qdoc: Finished "Inherited by" list for QML elements."Andreas Aardal Hanssen2010-02-256-44/+35
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 83d7242271cf8196a8133de0406788135e16abbb. Reviewed-by: Martin Smith
| | | * Revert "qdoc: List new QML elements in \sincelist for What's New page."Andreas Aardal Hanssen2010-02-252-28/+2
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d1b4e4666e4fe1a5fae0571c37535159c097f485. Reviewed-By: Martin Smith
| | * | Doc: Added a config file for creating Simplified Chinese docs directly.David Boddie2010-02-252-1/+87
| | |/ | | | | | | | | | Reviewed-by: Trust Me
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-231-1/+1
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (33 commits) Skip complex FBO tests if combined depth-stencil isn't supported Make tst_QGL::glWidgetRendering use same test as FBO autotest Updated WebKit from /home/jturcott/dev/webkit to qtwebkit-4.7-merged ( 9303f6d67fb964b71ed3e7361367c3ccfaba5e0a ) Updated WebKit from /home/jturcott/dev/webkit to qtwebkit-4.7-merged ( 5381ceeb37d97365cfb2f037650dbb4e495bca4e ) Adjust the mkdist-webkit script before the importation of WebKit. Make mediaservices use existing GStreamer qmake vars Detect GStreamer even when we're not building phonon Fix build on systems without XVideo headers Make the XVideo configure test actually pass if XV is present Add a configure test for XVideo support Fixed cosmetic glitch in QTabBar label's rendering improve sql support for mingw64 improve 64 bit support on windows Made the qDrawPixmaps() API public (with modifications). Fix GL viewports under -graphicssystem raster. QSortFilterProxyModel: Sorting occured unnecessarily when the dynamicSortFilter is turned off Fix test with gcc 4.0 where QT_USE_FAST_CONCATENATION cannot be enabled. Fix build with wingw Imporve win64 support for mingw Compile ...
| | * improve 64 bit support on windowsThierry Bastian2010-02-231-1/+1
| | |
* | | doc: Added \since 4.7 to several \qmlclass elements.Martin Smith2010-02-262-1/+9
|/ /
* | qdoc: List new QML elements in \sincelist for What's New page.Martin Smith2010-02-222-2/+28
| |
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1David Boddie2010-02-196-35/+44
|\ \
| * | qdoc: Finished "Inherited by" list for QML elements.Martin Smith2010-02-196-35/+44
| | | | | | | | | | | | | | | | | | The listed elements are now links. Task: QTBUG-8153
* | | Doc: Simplified Commercial Editions for Qt 4.7.David Boddie2010-02-196-52/+0
|/ / | | | | | | | | Reviewed-by: Trust Me Requested-by: Sales and Legal
* | qdoc: Added "Inherited by" list to QML elements.Martin Smith2010-02-185-10/+76
|/ | | | | | But the listed elements are not links yet, just plain text. Task: QTBUG-8153
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-1245-128/+9855
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits) Fix QRegion under Mac OS X. update according to Thiago's comments. Changes: add functionality for dbus auto start to qt Add license header to this file readdir64 is not available on HP-UX Fix bug in QDirPrivate::setPath, affecting QDir::cd, cdUp and setPath qdoc3: Completed handling of the new \pagekeywords command. Wrong cursor shown by the parent window after setOverrideCursor(). Fixed Mac OS X compile time error by using GLint for temp. qdoc3: Added curly braces in switch statement for braindead compiler. qdoc: Added a build rule for the documentation - disabled by default. Doc: Added the qdoc manual to the repository for future maintenance. qdoc3: Fixed bug in creation of qt.pageindex. qdoc3: Added capability to create qt.pageindex. Incorrect property setter generated by dumpcpp for Microsoft Word 2007. Cocoa: Implement our own NSApplication subclass Cocoa: Menu in menubar stays highlighted qdoc: Made a temporary fix for comment highlighting. Doc: Tidied up the class layout and removed an unnecessary image. Doc/qdoc: Use Chinese titles; canonicalize titles with non-ASCII chars. ...
| * Add license header to this fileThiago Macieira2010-02-121-0/+41
| |
| * qdoc3: Completed handling of the new \pagekeywords command.Martin Smith2010-02-112-2/+11
| | | | | | | | Task: QTBUG-7877
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-1134-104/+9587
| |\
| | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1David Boddie2010-02-1015-23/+202
| | |\
| | * | qdoc: Added a build rule for the documentation - disabled by default.David Boddie2010-02-101-0/+21
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | Doc: Added the qdoc manual to the repository for future maintenance.David Boddie2010-02-1014-0/+9262
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | qdoc: Made a temporary fix for comment highlighting.David Boddie2010-02-091-8/+6
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | Doc/qdoc: Use Chinese titles; canonicalize titles with non-ASCII chars.David Boddie2010-02-082-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation root in the qdocconf file now refers to the Chinese title for the Tutorials page. Modified qdoc's function to canonicalize titles so that it preserves characters that outside the range of ASCII letters and numbers. Reviewed-by: Trust Me
| | * | Doc/qdoc: Converted encoding of ISO-8859-1 docs to UTF-8. Output UTF-8.David Boddie2010-02-082-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We now write UTF-8 encoded XHTML and assume all pure documentation which isn't pure ASCII is now UTF-8 encoded. Reviewed-by: Trust Me
| | * | qdoc: Removed debugging code.David Boddie2010-02-081-2/+0
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | Doc: Updated the configuration file for the Simplified Chinese docs.David Boddie2010-02-081-11/+9
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | qdoc: Standardized encoding names and updated the Chinese config files.David Boddie2010-02-054-2/+152
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | Doc: Added Simplified Chinese documents and build rules for them.David Boddie2010-02-041-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also updated qdoc's configuration reader so that we can put UTF-8 content in the .qdocconf files later. Reviewed-by: Trust Me
| | * | Merge branch 'master' into qdoc-i18nDavid Boddie2010-02-036-8/+68
| | |\ \
| | * | | qdoc: Added support for different source and output character encodings.David Boddie2010-02-0210-84/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, qdoc assumed Latin1 (ISO-8859-1) for source code and other documentation, and wrote out XHTML with the same encoding. This change adds additional configuration options (sourceencoding, outputencoding, naturallanguage) that enable translated documentation in non-Latin1 encodings to be built with qdoc. To be reviewed before merge into the master branch. Reviewed-by: Trust Me
| | * | | Doc: Synchronize configuration files for easier maintenance.David Boddie2010-02-022-4/+5
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | qdoc3: Added curly braces in switch statement for braindead compiler.Martin Smith2010-02-114-11/+26
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Also added the \pagekeywords command. Task: QTBUG-7877
| * | | qdoc3: Fixed bug in creation of qt.pageindex.Martin Smith2010-02-101-1/+1
| | | | | | | | | | | | | | | | Task: QTBUG-7877
| * | | qdoc3: Added capability to create qt.pageindex.Martin Smith2010-02-1015-23/+202
| | | | | | | | | | | | | | | | Task: QTBUG-7877
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-054-6/+88
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3309 commits) Add some painting benchmarks. Make sure cookies are saved. Fix headers::licenseCheck autotest failure Re-add accidentally deleted file Test SizeItemToLoader to SizeLoaderToItem resizeMode change. Document QmlContext ownership. Add bug note. Fix elision and multilength strings when resizing a Text element. Document calling C++ methods from QML. Document margins property Augment documentation doc: There is no easeNone, it is called easeLinear doc: Converted the basic types page to use \qmlbasictype Focus focusScope from focusing for focusOnPress Really run image reader in its own thread. Don't create one QNetworkAccessManager per XMLHttpRequest We use JavaScript, not ECMAScript. XMLHttpRequest redirection update Image.paintedWidth and Image.paintedHeight when the source changes Remove debug. ...
| * | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2010-02-044-6/+88
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | git://git-nokia.trolltech.com.au/qtsoftware/qt/kinetic Conflicts: src/xmlpatterns/type/qprimitives_p.h tools/linguist/lupdate/main.cpp
| | * | Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2010-01-206-10/+10
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.cpp
| | | * | Bump version to 4.6.2.Jason McDonald2010-01-196-10/+10
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2010-01-191-1/+1
| | |\ \ \ | | | |/ /
| | * | | Doc fixes.Michael Brasser2010-01-152-3/+3
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7322
| | * | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2010-01-1493-93/+93
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: bin/syncqt src/corelib/io/qurl.cpp
| | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiAaron Kennedy2010-01-051-3/+3
| | |\ \ \ \