summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/test/qmake.qdocconf
Commit message (Collapse)AuthorAgeFilesLines
* Bump Qt version to 4.8.1Girish Ramakrishnan2012-03-051-2/+2
| | | | | | | | Change-Id: I117e5dcd45397a9fbd1f033fc745ada00c221721 Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Simo Fält <simo.falt@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-101-26/+32
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt demos/declarative/snake/content/snake.js demos/declarative/snake/snake.qml doc/src/development/qmake-manual.qdoc src/corelib/plugin/plugin.pri src/gui/kernel/qapplication_win.cpp src/gui/kernel/qdesktopwidget_win.cpp src/gui/painting/qdrawhelper.cpp tests/auto/qdir/tst_qdir.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf
| * Doc: updating the qdocconf files and the stylesheetMorten Engvoldsen2010-09-071-26/+32
| | | | | | | | | | QDocconf files was out of date in the section including extra files Style now shows numbered lists corectly
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-131-3/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qpainter.cpp src/gui/text/qtextengine.cpp tests/auto/qimage/tst_qimage.cpp tests/auto/qpainter/tst_qpainter.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf
| * qdoc: Removed three unused config variables.Martin Smith2010-08-051-3/+0
| | | | | | | | | | | | | | | | These no longer do anything in qdocconf files: online = false offline = false creator = true
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-07-281-0/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication.cpp tests/auto/qfileinfo/tst_qfileinfo.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| * Fixed the following sub-tasks for QTBUG-12192Kevin Wright2010-07-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Qt Simulator link missing * Integration and add-ins (on the front page, link leads to an alternative start page) * Qt Creator (on the front page link leads to Manual version 1.3) * Getting Started (on the front page) link broken * More... (in Global Declarations) link broken Additionally: There was an issue with the documentation used within Assistant/Creator that appears to have no bug report filed. An alternate "offline" form of the documentation (inspired by the newly redesigned online version) was being installed, but had significant issues within Assistant and Creator. It appears that within qdoc3 some changes had been made towards using this newer documentation format, but those changes were not working properly. I fixed qdoc3 so that the original offline documentation design is the default, but there is room to use the configuration files to call the any of the three documentation designs (new online, new offline, and old offline).
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-06-081-0/+2
|\ \ | |/ | | | | | | Conflicts: tools/qdoc3/test/qt-html-templates.qdocconf
| * Doc: adding offline docs to assistant and Qt Creator. Improving small docs ↵Morten Engvoldsen2010-06-021-0/+2
| | | | | | | | and adding highlighting
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-06-011-0/+1
|\ \ | |/
| * Doc: Changes to the HTMLGenerator, style and jsMorten Engvoldsen2010-05-211-0/+1
| | | | | | | | | | | | Replacing tables with lists in the HTML generator Adding img to search box Moving JS from template to script files
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-05-201-0/+3
|\ \ | |/
| * Doc: Adding support for IE 6, 7 and 8Morten Engvoldsen2010-05-181-0/+3
| | | | | | | | Fixing index page bugs
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-05-191-39/+21
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: tools/assistant/tools/assistant/centralwidget.cpp tools/assistant/tools/assistant/helpviewer_qwv.cpp tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf
| * Doc: A number of fixes and updates for the new design. See detailsMorten Engvoldsen2010-05-041-39/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | index.qdoc updated the HTML to use sprites images - deleted obsolete images from templates/images images - added new images to templates/images styles.css - updated styles to handle index, sprites and templates correct. assistant.qdoconf - updates images designer.qdoconf - updates images linguist.qdoconf - updates images declarative.qdoconf - updates images qmake.qdoconf - updates images qt-build-docs.qdoconf - updates images qt-build-docs_zh_CN.qdoconf - updates images qt-defines.qdoconf - updates images qt.qdoconf - updates images qt_zh_CN.qdoconf - updates images qt-htmlTemplates.qdoconf - updated template to use sprites declarativeui.qdoc - removed <br> Reviewed-by: Trust Me
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-04-271-1/+40
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/test/qt.qdocconf
| * qdoc: Updated the extra images variable again, for each manual.qdocconf.Martin Smith2010-04-221-2/+1
| | | | | | | | And this time I also did it for qdeclarative.qdocconf
| * qdoc: Updated the extra images variable for each manual.qdocconf.Martin Smith2010-04-211-1/+40
| |
* | Long live Qt 4.8!Jason McDonald2010-04-221-3/+3
|/
* qdoc: Changed qdoc to output the new doc format.Martin Smith2010-04-091-1/+2
| | | | Very cool.
* Merge branch '4.6'Thiago Macieira2009-09-291-1/+1
|\ | | | | | | | | Conflicts: doc/src/qt4-intro.qdoc
| * Assistant, Designer, Lingist and QMake manuals weren't generated.Jason McDonald2009-09-291-1/+1
| | | | | | | | | | | | | | | | | | qdoc3 warns when it doesn't find doc source files that are listed in the .qdocconf file, but it doesn't error out. Thus the manuals haven't been generated since the 4.6 doc reorganization, but the failure has been silent. Reviewed-by: Trust Me
* | Finish bumping version number to 4.7.0Jason McDonald2009-09-021-2/+2
| | | | | | | | Reviewed-by: Trust Me
* | Long live Qt 4.7Thiago Macieira2009-09-011-1/+1
|/ | | | | | Update Qt version markers to indicate Qt 4.7.0. The Qt 4.6 branch point was actually 6 commits ago...
* Update URL's to use new domain.Jason McDonald2009-08-121-1/+1
| | | | Reviewed-by: Trust Me
* Doc: Updated the version numbers in the documentation metadata.David Boddie2009-07-171-2/+2
| | | | Reviewed-by: Trust Me
* Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-281-1/+1
|\
| * Changed doc.trolltech.com links to doc.qtsoftware.comSimon Hausmann2009-04-281-1/+1
| | | | | | | | Reviewed-by: David Boddie
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-271-1/+1
|\ \ | |/
| * Increment Qt version number in qdoc namespaces.Jason McDonald2009-04-271-1/+1
| | | | | | | | | | | | | | | | As we saw with the 4.5.1 release, failing to increment the namespaces when incrementing the Qt version causes some featuresof Assistant to break. Reviewed-by: Trust Me
| * Change Qt version number to 4.5.2Thiago Macieira2009-04-241-1/+1
| | | | | | | | Reviewed-By: TrustMe
* | Remove git merge conflict markersSimon Hausmann2009-04-221-1/+0
| | | | | | | | Reviewed-by: Trust me
* | Merge branch '4.5'Rhys Weatherley2009-04-211-1/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
| * Doc - Changed the namespace in the qdocconf file to reflect Qt 4.5.1kh2009-04-211-2/+2
| | | | | | | | | | | | | | | | should have been part of c8285ec610b02f440f692be90aed1e6925a8675 Task-number: 251346 Reviewed-by: TrustMe BT: yes
| * Long live Qt 4.5!Lars Knoll2009-03-231-0/+40
|
* Long live Qt!Lars Knoll2009-03-231-0/+40
generated by cgit v0.12 at 2024-10-28 22:59:06 (GMT)